Update VLAN removal code to work with 5.10 kernel and newer iproute2 versions#1970
Merged
Pterosaur merged 4 commits intosonic-net:masterfrom Oct 28, 2021
Merged
Conversation
…versions There is an issue discovered by Alexander Allen where VLAN member removal from a VLAN doesn't fully happen on a 5.10 kernel. The reason for this is that there is a change in the output of the `bridge vlan show` command between the 4.19 kernel and the 5.10 kernel. To add to this, the output is different depending on whether iproute2 4.20 or iproute2 5.10 is installed. These output changes cause only some of the VLAN member removal code to run; specifically, the interface will not be the member of a VLAN anymore, but it will still be part of the bridge. Therefore, update the code that parses the output of `bridge vlan show` to handle iproute2 4.20 with 4.19 kernel, iproute2 4.20 with 5.10 kernel, and iproute2 5.10 with 5.10 kernel. This should cover all possible combinations we'll have until all containers are on Bullseye. Signed-off-by: Saikrishna Arcot <[email protected]>
This was referenced Oct 19, 2021
Pterosaur
requested changes
Oct 20, 2021
5 tasks
Signed-off-by: Saikrishna Arcot <[email protected]>
Pterosaur
previously approved these changes
Oct 22, 2021
Contributor
Author
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Signed-off-by: Saikrishna Arcot <[email protected]>
Pterosaur
approved these changes
Oct 28, 2021
Janetxxx
pushed a commit
to Janetxxx/sonic-swss
that referenced
this pull request
Nov 10, 2025
…r iproute2 versions (sonic-net#1970) * Update VLAN removal code to work with 5.10 kernel and newer iproute2 versions There is an issue discovered by Alexander Allen where VLAN member removal from a VLAN doesn't fully happen on a 5.10 kernel. The reason for this is that there is a change in the output of the `bridge vlan show` command between the 4.19 kernel and the 5.10 kernel. To add to this, the output is different depending on whether iproute2 4.20 or iproute2 5.10 is installed. These output changes cause only some of the VLAN member removal code to run; specifically, the interface will not be the member of a VLAN anymore, but it will still be part of the bridge. Therefore, update the code that parses the output of `bridge vlan show` to handle iproute2 4.20 with 4.19 kernel, iproute2 4.20 with 5.10 kernel, and iproute2 5.10 with 5.10 kernel. This should cover all possible combinations we'll have until all containers are on Bullseye. Signed-off-by: Saikrishna Arcot <[email protected]> * Store the exit code of the bridge vlan show command. Signed-off-by: Saikrishna Arcot <[email protected]> * Add missing space. Signed-off-by: Saikrishna Arcot <[email protected]>
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
2 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.
There is an issue discovered by Alexander Allen where VLAN member
removal from a VLAN doesn't fully happen on a 5.10 kernel. The reason
for this is that there is a change in the output of the
bridge vlan showcommand between the 4.19 kernel and the 5.10 kernel. To add tothis, the output is different depending on whether iproute2 4.20 or
iproute2 5.10 is installed. These output changes cause only some of the
VLAN member removal code to run; specifically, the interface will not be
the member of a VLAN anymore, but it will still be part of the bridge.
Therefore, update the code that parses the output of
bridge vlan showto handle iproute2 4.20 with 4.19 kernel, iproute2 4.20 with 5.10
kernel, and iproute2 5.10 with 5.10 kernel. This should cover all
possible combinations we'll have until all containers are on Bullseye.
Signed-off-by: Saikrishna Arcot [email protected]
What I did
Why I did it
How I verified it
Tested on virtual switch image with:
Details if related