libnetwork: fix sandbox restore #45654
Merged
Conversation
This file contains 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
Signed-off-by: Cory Snider <csnider@mirantis.com>
The method to restore a network namespace takes a collection of interfaces to restore with the options to apply. The interface names are structured data, tuples of (SrcName, DstPrefix) but for whatever reason are being passed into Restore() serialized to strings. A refactor, f0be4d1, accidentally broke the serialization by dropping the delimiter. Rather than fix the serialization and leave the time-bomb for someone else to trip over, pass the interface names as structured data. Signed-off-by: Cory Snider <csnider@mirantis.com>
corhere
added
area/networking
process/cherry-pick
kind/bugfix
neersighted
approved these changes
May 30, 2023
|
@neersighted indeed. I already referenced the offending commit in my commit message. |
|
Yup, just extremely late to the party -- I was looking at the diff locally trying to figure out how this even happened. Of course, after tracking it down in the blame, I noticed your comment 😆 I guess forgetting to check the commit message is even sillier 😅 |
Yes. Took me a minute to spot my mistake even after Cory posted the line where my mistake was 🥹. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
- What I did
Fixed passing the list of interfaces to restore.
- How I did it
By passing it as structured data.
- How to verify it
Live-restored containers can resolve other restored containers attached to the same networks over DNS.
docker statsshows nonzero NET I/O stats for restored containers.- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)