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

Merge pull request #6229 from mheon/small_kata_fix

Browse Source 
Cleanup OCI runtime before storage
This commit is contained in:
OpenShift Merge Robot
2020-05-14 12:51:39 -07:00
committed by GitHub
parent 32268eaa62 892d81685c
commit 0d9625152b
2 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
libpod/container_internal.go
View File

@ -1562,6 +1562,18 @@ func (c *Container) cleanup(ctx context.Context) error {
lastError = errors.Wrapf(err, "error removing container %s network", c.ID()) lastError = errors.Wrapf(err, "error removing container %s network", c.ID())
} }
// Remove the container from the runtime, if necessary.
// Do this *before* unmounting storage - some runtimes (e.g. Kata)
// apparently object to having storage removed while the container still
// exists.
if err := c.cleanupRuntime(ctx); err != nil {
if lastError != nil {
logrus.Errorf("Error removing container %s from OCI runtime: %v", c.ID(), err)
} else {
lastError = err
}
}
// Unmount storage // Unmount storage
if err := c.cleanupStorage(); err != nil { if err := c.cleanupStorage(); err != nil {
if lastError != nil { if lastError != nil {
@ -1571,15 +1583,6 @@ func (c *Container) cleanup(ctx context.Context) error {
} }
} }
// Remove the container from the runtime, if necessary
if err := c.cleanupRuntime(ctx); err != nil {
if lastError != nil {
logrus.Errorf("Error removing container %s from OCI runtime: %v", c.ID(), err)
} else {
lastError = err
}
}
return lastError return lastError
} }

19
libpod/runtime_ctr.go
View File

@ -488,20 +488,25 @@ func (r *Runtime) removeContainer(ctx context.Context, c *Container, force bool,
} }
} }
var cleanupErr error
// Clean up network namespace, cgroups, mounts.
// Do this before we set ContainerStateRemoving, to ensure that we can
// actually remove from the OCI runtime.
if err := c.cleanup(ctx); err != nil {
cleanupErr = errors.Wrapf(err, "error cleaning up container %s", c.ID())
}
// Set ContainerStateRemoving // Set ContainerStateRemoving
c.state.State = define.ContainerStateRemoving c.state.State = define.ContainerStateRemoving
if err := c.save(); err != nil { if err := c.save(); err != nil {
if cleanupErr != nil {
logrus.Errorf(err.Error())
}
return errors.Wrapf(err, "unable to set container %s removing state in database", c.ID()) return errors.Wrapf(err, "unable to set container %s removing state in database", c.ID())
} }
var cleanupErr error
// Clean up network namespace, cgroups, mounts
if err := c.cleanup(ctx); err != nil {
cleanupErr = errors.Wrapf(err, "error cleaning up container %s", c.ID())
}
// Stop the container's storage // Stop the container's storage
if err := c.teardownStorage(); err != nil { if err := c.teardownStorage(); err != nil {
if cleanupErr == nil { if cleanupErr == nil {