[Bug Fix] docker_image_ctl.j2: remove the logic that recreates database containers on VS platform#21089
Merged
rlhui merged 3 commits intosonic-net:masterfrom Dec 23, 2024
Merged
Conversation
…ocker container when the asic type is vs
BYGX-wcr
requested review from
abdosi and
deepak-singhal0408
and removed request for
lguohan
Contributor
|
/azpw ms_conflict |
Collaborator
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
BYGX-wcr
changed the title
Collaborator
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Contributor
|
@BYGX-wcr Have you tried single asic to multi-asic transition? |
Contributor
Author
Yes |
Contributor
|
@BYGX-wcr , as discussed, please update the description, on whats needed for multi-asic transition (remove database container before reboot).? Also make sure the change works on our internal emulation. thanks |
Contributor
Author
|
@deepak-singhal0408 , I have updated the description of the PR. |
deepak-singhal0408
approved these changes
Dec 23, 2024
BYGX-wcr
added
Request for 202405 Branch
Request for 202411 Branch
Chassis for 202205 branch
mssonicbld
pushed a commit
to mssonicbld/sonic-buildimage
that referenced
this pull request
Dec 24, 2024
…se containers on VS platform (sonic-net#21089) Why I did it To support the emulation of VS chassis, we need to remove the existing critical service containers before transforming the HwSKU of the VS device. A previous PR sonic-net#18512 introduced a change to the docker_image_ctl.j2 that forces VS images to recreate database containers every time the OS is cold started while the behaviors of other containers(swss/bgp/teamd/syncd) remained unchanged. As a consequence, when the VS device is rebooted without proper human intervention, the database containers will be recreated while the other services will reuse existing containers. That can cause the swss/bgp/syncd containers to become invalid if the database containers get recreated with a different container ID, because swss/bgp/syncd containers are configured to use the database containers as the underlying networking stack. By further investigation, we have found that it is not necessary to recreate the database containers in /usr/bin/database.sh to perform HwSKU transformation. So, we should remove this logic.
Collaborator
|
Cherry-pick PR to 202405: #21276 |
mssonicbld
pushed a commit
that referenced
this pull request
Dec 25, 2024
…se containers on VS platform (#21089) Why I did it To support the emulation of VS chassis, we need to remove the existing critical service containers before transforming the HwSKU of the VS device. A previous PR #18512 introduced a change to the docker_image_ctl.j2 that forces VS images to recreate database containers every time the OS is cold started while the behaviors of other containers(swss/bgp/teamd/syncd) remained unchanged. As a consequence, when the VS device is rebooted without proper human intervention, the database containers will be recreated while the other services will reuse existing containers. That can cause the swss/bgp/syncd containers to become invalid if the database containers get recreated with a different container ID, because swss/bgp/syncd containers are configured to use the database containers as the underlying networking stack. By further investigation, we have found that it is not necessary to recreate the database containers in /usr/bin/database.sh to perform HwSKU transformation. So, we should remove this logic.
mssonicbld
added
Included in 202405 Branch
and removed
Created PR to 202405 Branch
labels
VladimirKuk
pushed a commit
to Marvell-switching/sonic-buildimage
that referenced
this pull request
Jan 21, 2025
…se containers on VS platform (sonic-net#21089) Why I did it To support the emulation of VS chassis, we need to remove the existing critical service containers before transforming the HwSKU of the VS device. A previous PR sonic-net#18512 introduced a change to the docker_image_ctl.j2 that forces VS images to recreate database containers every time the OS is cold started while the behaviors of other containers(swss/bgp/teamd/syncd) remained unchanged. As a consequence, when the VS device is rebooted without proper human intervention, the database containers will be recreated while the other services will reuse existing containers. That can cause the swss/bgp/syncd containers to become invalid if the database containers get recreated with a different container ID, because swss/bgp/syncd containers are configured to use the database containers as the underlying networking stack. By further investigation, we have found that it is not necessary to recreate the database containers in /usr/bin/database.sh to perform HwSKU transformation. So, we should remove this logic.
BYGX-wcr
added
Request for msft-202503 Branch
and removed
Request for 202411 Branch
labels
11 tasks
Collaborator
|
Cherry-pick PR to msft-202503: Azure/sonic-buildimage-msft#1703 |
mssonicbld
added
Included in msft-202503 Branch
and removed
Created PR to msft-202503 Branch
labels
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Why I did it
To support the emulation of VS chassis, we need to remove the existing critical service containers before transforming the HwSKU of the VS device. A previous PR #18512 introduced a change to the docker_image_ctl.j2 that forces VS images to recreate database containers every time the OS is cold started while the behaviors of other containers(swss/bgp/teamd/syncd) remained unchanged. As a consequence, when the VS device is rebooted without proper human intervention, the database containers will be recreated while the other services will reuse existing containers. That can cause the swss/bgp/syncd containers to become invalid if the database containers get recreated with a different container ID, because swss/bgp/syncd containers are configured to use the database containers as the underlying networking stack.
By further investigation, we have found that it is not necessary to recreate the database containers in /usr/bin/database.sh to perform HwSKU transformation. So, we should remove this logic.
Work item tracking
How I did it
Remove the code that removes existing database containers in /usr/bin/database.sh
How to verify it
Which release branch to backport (provide reason below if selected)
The original change was introduced into 202205 branch so we need to backport this fix.
Tested branch (Please provide the tested image version)
Description for the changelog
docker_image_ctl.j2: change to not remove existing database containers on VS platform