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

Gracefully handle containers removed from c/storage 

Allow containers that no longer exist in storage to be evicted
from the state instead of erroring.

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

Closes: #764
Approved by: rhatdan
This commit is contained in:
Matthew Heon 2018-05-14 10:17:24 -04:00 committed by Atomic Bot
parent 99532e6f3e
commit 69a6cb255c
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libpod/container_internal.go
View File

@ -277,7 +277,7 @@ func (c *Container) teardownStorage() error {
// error - we wanted it gone, it is already gone. // error - we wanted it gone, it is already gone.
// Potentially another tool using containers/storage already // Potentially another tool using containers/storage already
// removed it? // removed it?
if err == storage.ErrNotAContainer { if err == storage.ErrNotAContainer || err == storage.ErrContainerUnknown {
logrus.Warnf("Storage for container %s already removed", c.ID()) logrus.Warnf("Storage for container %s already removed", c.ID())
return nil return nil
} }
@ -791,6 +791,15 @@ func (c *Container) cleanupStorage() error {
// Also unmount storage // Also unmount storage
if err := c.runtime.storageService.UnmountContainerImage(c.ID()); err != nil { if err := c.runtime.storageService.UnmountContainerImage(c.ID()); err != nil {
// If the container has already been removed, warn but don't
// error
// We still want to be able to kick the container out of the
// state
if err == storage.ErrNotAContainer || err == storage.ErrContainerUnknown {
logrus.Errorf("Storage for container %s has been removed", c.ID())
return nil
}
return errors.Wrapf(err, "error unmounting container %s root filesystem", c.ID()) return errors.Wrapf(err, "error unmounting container %s root filesystem", c.ID())
} }