Skip to content

container_internal: don't ignore error from cleanupNetwork() #1002

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.

Sign up for GitHub

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

Closed
giuseppe wants to merge 1 commit into from
Closed

container_internal: don't ignore error from cleanupNetwork() #1002

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libpod/container_internal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -923,7 +923,7 @@ func (c *Container) cleanup() error {

// Clean up network namespace, if present
if err := c.cleanupNetwork(); err != nil {
lastError = nil
lastError = err
Copy link
Copy Markdown
Contributor

@wking wking Jun 26, 2018

Choose a reason for hiding this comment

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

This had been non-fatal since #302, but I don't see any discussion there about why it was non-fatal then.

Copy link
Copy Markdown
Member

@rhatdan rhatdan Jun 26, 2018

Choose a reason for hiding this comment

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

The only think I can think of was there is an issue where the cleanupNetwork can return an error that states the network does not exist, since it was cleaned up previously but there is no current way for us to check for that error because the oci network code does not use constants.

Copy link
Copy Markdown
Member

@mheon mheon Jun 26, 2018

Choose a reason for hiding this comment

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

I think were were just being overly cautious there, given that we were already only warning on errors from teardownNetwork() in cleanupNetwork().

}

if err := c.cleanupCgroups(); err != nil {
Expand Down