opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-08-06 19:44:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #23553 from Luap99/net-cleanup-err

Browse Source 
libpod: cleanupNetwork() return error
This commit is contained in:
openshift-merge-bot[bot]
2024-08-09 10:29:37 +00:00
committed by GitHub
parent 8c79fa99f0 f2a03e5753
commit d305a34b11
2 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libpod/container_internal_freebsd.go
View File

@ -146,15 +146,18 @@ func (c *Container) cleanupNetwork() error {
} }
// Stop the container's network namespace (if it has one) // Stop the container's network namespace (if it has one)
if err := c.runtime.teardownNetNS(c); err != nil { neterr := c.runtime.teardownNetNS(c)
logrus.Errorf("Unable to cleanup network for container %s: %q", c.ID(), err)
// always save even when there was an error
err = c.save()
if err != nil {
if neterr != nil {
logrus.Errorf("Unable to clean up network for container %s: %q", c.ID(), neterr)
}
return err
} }
if c.valid { return neterr
return c.save()
}
return nil
} }
// reloadNetwork reloads the network for the given container, recreating // reloadNetwork reloads the network for the given container, recreating

16
libpod/container_internal_linux.go
View File

@ -187,18 +187,20 @@ func (c *Container) cleanupNetwork() error {
} }
// Stop the container's network namespace (if it has one) // Stop the container's network namespace (if it has one)
if err := c.runtime.teardownNetNS(c); err != nil { neterr := c.runtime.teardownNetNS(c)
logrus.Errorf("Unable to clean up network for container %s: %q", c.ID(), err)
}
c.state.NetNS = "" c.state.NetNS = ""
c.state.NetworkStatus = nil c.state.NetworkStatus = nil
if c.valid { // always save even when there was an error
return c.save() err = c.save()
if err != nil {
if neterr != nil {
logrus.Errorf("Unable to clean up network for container %s: %q", c.ID(), neterr)
}
return err
} }
return nil return neterr
} }
// reloadNetwork reloads the network for the given container, recreating // reloadNetwork reloads the network for the given container, recreating