opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-24 19:42:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18462 from Luap99/no-cleanup-twice

Browse Source 
libpod: do not Cleanup() more than once
This commit is contained in:
OpenShift Merge Robot
2023-05-04 09:55:06 -04:00
committed by GitHub
parent 4f8a84a310 95557a532e
commit 8bfb27a3ce
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libpod/container_api.go
View File

@ -765,6 +765,11 @@ func (c *Container) Cleanup(ctx context.Context) error {
return fmt.Errorf("container %s is running or paused, refusing to clean up: %w", c.ID(), define.ErrCtrStateInvalid) return fmt.Errorf("container %s is running or paused, refusing to clean up: %w", c.ID(), define.ErrCtrStateInvalid)
} }
// if the container was not created in the oci runtime or was already cleaned up, then do nothing
if c.ensureState(define.ContainerStateConfigured, define.ContainerStateExited) {
return nil
}
// Handle restart policy. // Handle restart policy.
// Returns a bool indicating whether we actually restarted. // Returns a bool indicating whether we actually restarted.
// If we did, don't proceed to cleanup - just exit. // If we did, don't proceed to cleanup - just exit.

6
test/e2e/stop_test.go
View File

@ -126,6 +126,12 @@ var _ = Describe("Podman stop", func() {
finalCtrs.WaitWithDefaultTimeout() finalCtrs.WaitWithDefaultTimeout()
Expect(finalCtrs).Should(Exit(0)) Expect(finalCtrs).Should(Exit(0))
Expect(strings.TrimSpace(finalCtrs.OutputToString())).To(Equal("")) Expect(strings.TrimSpace(finalCtrs.OutputToString())).To(Equal(""))
// make sure we only have one cleanup event for this container
events := podmanTest.Podman([]string{"events", "--since=30s", "--stream=false"})
events.WaitWithDefaultTimeout()
Expect(events).Should(Exit(0))
Expect(strings.Count(events.OutputToString(), "container cleanup")).To(Equal(1), "cleanup event should show up exactly once")
}) })
It("podman stop all containers -t", func() { It("podman stop all containers -t", func() {