Skip to content

Commit

Permalink
Merge pull request #10476 from mheon/ensure_exists_on_remove
Browse files Browse the repository at this point in the history
Ensure that container still exists when removing
  • Loading branch information
openshift-merge-robot authored May 27, 2021
2 parents d9eb126 + fad6e1d commit 542d730
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions libpod/runtime_ctr.go
Original file line number Diff line number Diff line change
Expand Up @@ -581,6 +581,15 @@ func (r *Runtime) removeContainer(ctx context.Context, c *Container, force, remo
if err := c.stop(c.StopTimeout()); err != nil && errors.Cause(err) != define.ErrConmonDead {
return errors.Wrapf(err, "cannot remove container %s as it could not be stopped", c.ID())
}

// We unlocked as part of stop() above - there's a chance someone
// else got in and removed the container before we reacquired the
// lock.
// Do a quick ping of the database to check if the container
// still exists.
if ok, _ := r.state.HasContainer(c.ID()); !ok {
return nil
}
}

// Remove all active exec sessions
Expand Down

0 comments on commit 542d730

Please sign in to comment.