matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Port fix for https://github.com/Azure/sonic-buildimage/pull/6537 in 201911 (#6648)

Browse Source 
The Portchannels were not getting cleaned up as the cleanup activity was taking more than 10 secs which is default docker timeout after which a SIGKILL will be send.

Fix Issue #6537
This commit is contained in:
judyjoseph 2021-02-26 17:16:33 -08:00 committed by GitHub
parent 8e0faf42f3
commit b05a4f1c30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
files/build_templates/docker_image_ctl.j2
View File

@ -366,7 +366,12 @@ wait() {
} }
stop() { stop() {
{%- if docker_container_name == "teamd" %}
# Longer timeout of 60 sec to wait for Portchannels to be cleaned.
docker stop -t 60 {{docker_container_name}}$DEV
{%- else %}
docker stop {{docker_container_name}}$DEV docker stop {{docker_container_name}}$DEV
{%- endif %}
{%- if docker_container_name == "database" %} {%- if docker_container_name == "database" %}
if [ "$DEV" ]; then if [ "$DEV" ]; then
ip netns delete "$NET_NS" ip netns delete "$NET_NS"