container/podman
container/podman
1
0
Fork 0
mirror of https://github.com/containers/podman synced 2024-10-21 09:45:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Errors from closing a netns on removal from DB are nonfatal

Browse source 
Upon updating a container, if its network namespace has been
removed, we attempt to clean up the network namespace locally,
to ensure we don't leave hanging file descriptors. This triggers
cleanup code which assumes the network namespace still exists,
but it almost certainly was removed by whoever removed it from
the database. As such, we end up with unavoidable errors if we
don't want to leak FDs. Make these errors nonfatal and log them
because of this.

Signed-off-by: Matthew Heon <matthew.heon@gmail.com>

Closes: #962
Approved by: rhatdan
This commit is contained in:
Matthew Heon 2018-06-18 13:52:09 -04:00 committed by Atomic Bot
parent aa1ccfb094
commit 2d0d1c4b5f
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libpod/boltdb_state.go
View file

@ -7,6 +7,7 @@ import (
"github.com/boltdb/bolt"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
)
// BoltState is a state implementation backed by a Bolt DB
@ -455,7 +456,7 @@ func (s *BoltState) UpdateContainer(ctr *Container) error {
} else {
// Tear down the existing namespace
if err := s.runtime.teardownNetNS(ctr); err != nil {
return err
logrus.Warnf(err.Error())
}
// Open the new network namespace
@ -469,7 +470,7 @@ func (s *BoltState) UpdateContainer(ctr *Container) error {
// The container no longer has a network namespace
// Tear down the old one
if err := s.runtime.teardownNetNS(ctr); err != nil {
return err
logrus.Warnf(err.Error())
}
}