Skip to content
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

Jump to bottom

[Supervisor][fabric] Fix the error message for non-present fabric card during config reload on SUP #19778

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[Supervisor][fabric] Fix the error message for non-present fabric card during config reload on SUP #19778

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7625ae
[Supervisor][fabric] Fix the error message for non-present fabric car…
mlok-nokia Aug 2, 2024
b6e727b
Address comment: modify the code to generic to handle teamd also
mlok-nokia Sep 19, 2024
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
17 changes: 12 additions & 5 deletions files/build_templates/docker_image_ctl.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -731,13 +731,20 @@ stop() {
if [[ "$DEV" && $DATABASE_TYPE != "dpudb" ]]; then
ip netns delete "$NET_NS"
fi
{%- elif docker_container_name == "teamd" %}
# Longer timeout of 60 sec to wait for Portchannels to be cleaned.
/usr/local/bin/container stop -t 60 $DOCKERNAME
{%- else %}
container_id=$(docker ps --filter "name=$DOCKERNAME" --quiet)
if [ -z "$container_id" ]; then
echo "container stop $DOCKERNAME - No such container: $DOCKERNAME"
else
{%- if docker_container_name == "teamd" %}
# Longer timeout of 60 sec to wait for Portchannels to be cleaned.
/usr/local/bin/container stop -t 60 $DOCKERNAME
{%- elif docker_container_name in ["swss", "syncd"] and enable_asan == "y" %}
/usr/local/bin/container stop -t 60 $DOCKERNAME
/usr/local/bin/container stop -t 60 $DOCKERNAME
{%- else %}
/usr/local/bin/container stop $DOCKERNAME
/usr/local/bin/container stop $DOCKERNAME
{%- endif %}
fi
{%- endif %}
}

Expand Down
Loading