-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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
libpod: cleanupNetwork() return error #23553
Conversation
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: Luap99 The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
@mheon PTAL |
LGTM |
@edsantiago please pick this into the no flake try PRs, I have not seen the flake in #23487 for 3 pushes now but I am not sure if this is just luck because I don't think this is actually changing anything other than the error message. |
Also this hang in debian is a new one I don't recall having seen before, don't know if it's related to any recent work |
Ack I saw a hang on my PR as well but I cannot see how this change would cause this. |
that's #22246, the one Matt is working on |
libpod/container_internal_linux.go
Outdated
c.state.NetNS = "" | ||
c.state.NetworkStatus = nil | ||
|
||
if c.valid { | ||
return c.save() | ||
// always safe even when there was an error |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
safe or save?
Is this what you were hoping for?
|
Or this one but I don't see the new error message here either |
yes that one should be fixed with the fixes in c/common I think containers/common#2112 #23519 But that doesn't fix the very clear issue of podman calling cleanup twice. |
Return the error not just log as the caller can then decide to log this and exit > 0. I also removed the c.valid check as I do not see what the purpose of this would be. c.valid is only false when the ctr was removed but then we should never get there as Cleanup() will not work on a container in removing state. Signed-off-by: Paul Holzinger <[email protected]>
/lgtm |
Return the error not just log as the caller can then decide to log this and exit > 0. I also removed the c.valid check as I do not see what the purpose of this would be. c.valid is only false when the ctr was removed but then we should never get there as Cleanup() will not work on a container in removing state.
Does this PR introduce a user-facing change?