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.

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

[24.0 backport] libnetwork: fix sandbox restore #45658

Conversation

corhere
Copy link
Contributor

@corhere corhere commented May 30, 2023

- 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 stats shows nonzero NET I/O stats for restored containers.

- Description for the changelog

  • Fixed an issue which caused container networking of live-restored containers to malfunction in various ways after restarting the daemon

- A picture of a cute animal (not mandatory but encouraged)

Signed-off-by: Cory Snider <csnider@mirantis.com>
(cherry picked from commit 18bf3aa)
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>
(cherry picked from commit 50eb2d2)
Signed-off-by: Cory Snider <csnider@mirantis.com>
@corhere corhere added area/networking kind/bugfix PR's that fix bugs labels May 30, 2023
@corhere corhere added this to the 24.0.3 milestone May 30, 2023
Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Member

@akerouanton akerouanton left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@neersighted neersighted merged commit ebe2948 into moby:24.0 May 30, 2023
101 checks passed
@corhere corhere deleted the backport-24.0/libn/fix-embedded-resolver-live-reload branch May 31, 2023 18:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants