From e351d01fd014a37d482c3301a4f843974798f4ab Mon Sep 17 00:00:00 2001 From: Shuotian Cheng Date: Wed, 1 Mar 2017 13:10:13 -0800 Subject: [PATCH] [teamd]: Update the start.sh script to clean up the docker state This change should be temporary because the current teamd cannot re-create net devices acrosss restart. Basically, it will fail when there're files in /var/run/teamd/ folder or the previously created net devices are still there. Thus, the current workaround is to remove the obsolete files to restart the docker-teamd. This workaround cannot resolve the swss restart issue. Before restarting swss, docker teamd needs to be stopped manually. After swss starts, docker teamd needs to be restarted manually. This change will only make sure that rebooting the switch will make the switch at the correct state. Signed-off-by: Shuotian Cheng --- dockers/docker-teamd/start.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dockers/docker-teamd/start.sh b/dockers/docker-teamd/start.sh index 268217272f6e..e68b3ed00b8f 100755 --- a/dockers/docker-teamd/start.sh +++ b/dockers/docker-teamd/start.sh @@ -2,9 +2,17 @@ TEAMD_CONF_PATH=/etc/teamd +# Before teamd could automatically add newly created host interfaces into the +# LAG, this workaround will be needed. It will remove the obsolete files and +# net devices that are failed to be removed in the previous run. function start_app { + # Remove *.pid and *.sock files if there are any + rm -f /var/run/teamd/* if [ -d $TEAMD_CONF_PATH ]; then for f in $TEAMD_CONF_PATH/*; do + # Remove netdevs if there are any + intf=`echo $f | awk -F'[/.]' '{print $4}'` + ip link del $intf teamd -f $f -d done fi