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

[19.03 backport] Fix 'failed to get network during CreateEndpoint' #2565

Merged
merged 1 commit into from
Jun 10, 2020
Merged

[19.03 backport] Fix 'failed to get network during CreateEndpoint' #2565

merged 1 commit into from
Jun 10, 2020

Conversation

s0j
Copy link

@s0j s0j commented Jun 9, 2020

backport of #2554 for the 19.03 branch

Fix 'failed to get network during CreateEndpoint' during container starting.
Change the error type to libnetwork.ErrNoSuchNetwork, so Start() in daemon/cluster/executor/container/controller.go will recreate the network.

Signed-off-by: Xinfeng Liu [email protected]
(cherry picked from commit 1df7f7e)
Signed-off-by: Shane Jarych [email protected]

Fix 'failed to get network during CreateEndpoint' during container starting.
Change the error type to `libnetwork.ErrNoSuchNetwork`, so `Start()` in `daemon/cluster/executor/container/controller.go` will recreate the network.

Signed-off-by: Xinfeng Liu <[email protected]>
(cherry picked from commit 1df7f7e)
Signed-off-by: Shane Jarych <[email protected]>
@s0j s0j marked this pull request as ready for review June 9, 2020 16:14
Copy link
Member

@SamWhited SamWhited left a comment

Choose a reason for hiding this comment

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

LGTM. Minor nit that the error should either be handled (ie logged) or returned, but not both, but it's a backport so probably not something to be fixed in this PR.

Copy link
Collaborator

@selansen selansen left a comment

Choose a reason for hiding this comment

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

LGTM

@selansen selansen merged commit 86d159c into moby:bump_19.03 Jun 10, 2020
@s0j s0j deleted the s0j_bump_19.03_fix-network-not-found branch June 11, 2020 13:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants