containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16016 from Luap99/netns-cleanup 

cleanup: always delete netns mount
This commit is contained in:
OpenShift Merge Robot 2022-10-01 03:57:02 +02:00 committed by GitHub
parent 63c69f3b15 eb7f54ef6f
commit 84aff621f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libpod/networking_linux.go
View File

@ -695,23 +695,31 @@ func (r *Runtime) teardownNetNS(ctr *Container) error {
// do not return an error otherwise we would prevent network cleanup // do not return an error otherwise we would prevent network cleanup
logrus.Errorf("failed to free gvproxy machine ports: %v", err) logrus.Errorf("failed to free gvproxy machine ports: %v", err)
} }
if err := r.teardownCNI(ctr); err != nil {
return err // Do not check the error here, we want to always umount the netns
} // This will ensure that the container interface will be deleted
// even when there is a CNI or netavark bug.
prevErr := r.teardownCNI(ctr)
// First unmount the namespace // First unmount the namespace
if err := netns.UnmountNS(ctr.state.NetNS); err != nil { if err := netns.UnmountNS(ctr.state.NetNS); err != nil {
if prevErr != nil {
logrus.Error(prevErr)
}
return fmt.Errorf("unmounting network namespace for container %s: %w", ctr.ID(), err) return fmt.Errorf("unmounting network namespace for container %s: %w", ctr.ID(), err)
} }
// Now close the open file descriptor // Now close the open file descriptor
if err := ctr.state.NetNS.Close(); err != nil { if err := ctr.state.NetNS.Close(); err != nil {
if prevErr != nil {
logrus.Error(prevErr)
}
return fmt.Errorf("closing network namespace for container %s: %w", ctr.ID(), err) return fmt.Errorf("closing network namespace for container %s: %w", ctr.ID(), err)
} }
ctr.state.NetNS = nil ctr.state.NetNS = nil
return nil return prevErr
} }
func getContainerNetNS(ctr *Container) (string, *Container, error) { func getContainerNetNS(ctr *Container) (string, *Container, error) {