Skip to content

Commit

Permalink
Merge pull request #11388 from Luap99/stop-cleanup
Browse files Browse the repository at this point in the history
podman stop always cleanup
  • Loading branch information
openshift-merge-robot authored Sep 1, 2021
2 parents 5c33699 + a55f595 commit f5cfb0d
Showing 1 changed file with 10 additions and 6 deletions.
16 changes: 10 additions & 6 deletions pkg/domain/infra/abi/containers.go
Original file line number Diff line number Diff line change
Expand Up @@ -173,13 +173,17 @@ func (ic *ContainerEngine) ContainerStop(ctx context.Context, namesOrIds []strin
return err
}
}
if c.AutoRemove() {
// Issue #7384: if the container is configured for
// auto-removal, it might already have been removed at
// this point.
return nil
err = c.Cleanup(ctx)
if err != nil {
// Issue #7384 and #11384: If the container is configured for
// auto-removal, it might already have been removed at this point.
// We still need to to cleanup since we do not know if the other cleanup process is successful
if c.AutoRemove() && (errors.Is(err, define.ErrNoSuchCtr) || errors.Is(err, define.ErrCtrRemoved)) {
return nil
}
return err
}
return c.Cleanup(ctx)
return nil
})
if err != nil {
return nil, err
Expand Down

0 comments on commit f5cfb0d

Please sign in to comment.