opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-23 18:59:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11754 from flouthoc/podman-stop-report-non-running

Browse Source 
stop: Do nothing if container was never created in runtime or in a invalid state.
This commit is contained in:
OpenShift Merge Robot
2021-09-27 11:58:59 -04:00
committed by GitHub
parent 899d5d7d7c 8fca626e33
commit b60cff8cf8
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/domain/infra/abi/containers.go
View File

@ -169,6 +169,10 @@ func (ic *ContainerEngine) ContainerStop(ctx context.Context, namesOrIds []strin
logrus.Debugf("Container %s is already stopped", c.ID()) logrus.Debugf("Container %s is already stopped", c.ID())
case options.All && errors.Cause(err) == define.ErrCtrStateInvalid: case options.All && errors.Cause(err) == define.ErrCtrStateInvalid:
logrus.Debugf("Container %s is not running, could not stop", c.ID()) logrus.Debugf("Container %s is not running, could not stop", c.ID())
// container never created in OCI runtime
// docker parity: do nothing just return container id
case errors.Cause(err) == define.ErrCtrStateInvalid:
logrus.Debugf("Container %s is either not created on runtime or is in a invalid state", c.ID())
default: default:
return err return err
} }

11
test/e2e/stop_test.go
View File

@ -234,6 +234,17 @@ var _ = Describe("Podman stop", func() {
Expect(strings.TrimSpace(finalCtrs.OutputToString())).To(Equal("")) Expect(strings.TrimSpace(finalCtrs.OutputToString())).To(Equal(""))
}) })
It("podman stop should return silent success on stopping configured containers", func() {
// following container is not created on OCI runtime
// so we return success and assume that is is stopped
session2 := podmanTest.Podman([]string{"create", "--name", "stopctr", ALPINE, "/bin/sh"})
session2.WaitWithDefaultTimeout()
Expect(session2).Should(Exit(0))
session3 := podmanTest.Podman([]string{"stop", "stopctr"})
session3.WaitWithDefaultTimeout()
Expect(session3).Should(Exit(0))
})
It("podman stop --cidfile", func() { It("podman stop --cidfile", func() {
tmpDir, err := ioutil.TempDir("", "") tmpDir, err := ioutil.TempDir("", "")