Skip to content

add support for MCLAG #453

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rlhui merged 7 commits into from
Feb 24, 2020
Merged

add support for MCLAG #453

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
946a02a
add support for MCLAG
Feb 1, 2019
c7f65a0
add warm-reboot support for ICCPd
Jul 11, 2019
2dcf086
merge to master branch and resolve the conflict
Sep 23, 2019
758d033
ensure iccpd is there before stop iccpd
Nov 13, 2019
3d6db7a
fix service function
shine4chen Dec 1, 2019
c8dd172
remove unused comment
shine4chen Dec 10, 2019
796786c
refactor code according to feature management mechanism
Dec 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions config/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,7 @@ def _stop_services():
'lldp',
'pmon',
'bgp',
'iccpd',
'hostcfgd',
]

Expand Down Expand Up @@ -346,6 +347,7 @@ def _reset_failed_services():
'snmp',
'swss',
'syncd',
'iccpd',
'teamd'
]

Expand All @@ -365,6 +367,7 @@ def _restart_services():
'rsyslog-config',
'swss',
'bgp',
'iccpd',
'pmon',
'lldp',
'hostcfgd',
Expand Down
18 changes: 18 additions & 0 deletions scripts/fast-reboot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,24 @@ debug "Stopped bgp ..."
docker kill lldp > /dev/null
systemctl stop lldp

# Kill iccpd
#docker kill iccpd > /dev/null

if [[ "$REBOOT_TYPE" = "fast-reboot" ]]; then
docker kill iccpd > /dev/null
fi

# Stop iccpd gracefully
if [[ "$REBOOT_TYPE" = "warm-reboot" || "$REBOOT_TYPE" = "fastfast-reboot" ]]; then
debug "Stopping iccpd ..."
# Send USR1 signal to iccpd to stop it
# It will prepare iccpd for warm-reboot
# Note: We must send USR1 signal before syncd, or some state of iccpd maybe lost
docker exec -i iccpd pkill -USR1 iccpd || [ $? == 1 ] > /dev/null
debug "Stopped iccpd ..."
fi


if [[ "$REBOOT_TYPE" = "fast-reboot" ]]; then
# Kill teamd processes inside of teamd container with SIGUSR2 to allow them to send last LACP frames
# We call `docker kill teamd` to ensure the container stops as quickly as possible,
Expand Down