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

libpod: do not save expected stop errors in ctr state

Browse Source 
If we try to stop a contianer that is not running or paused we get an
ErrCtrStateInvalid or ErrCtrStopped error. As podman stop is idempotent
this is not a user visable error at all so we should also never log it
in the container state.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger
2024-08-12 11:39:24 +02:00
parent f276d53532
commit 78cb1e28cb
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libpod/container_api.go
View File

@ -263,7 +263,11 @@ func (c *Container) StopWithTimeout(timeout uint) (finalErr error) {
// defer's are executed LIFO so we are locked here
// as long as we call this after the defer unlock()
defer func() {
if finalErr != nil {
// The podman stop command is idempotent while the internal function here is not.
// As such we do not want to log these errors in the state because they are not
// actually user visible errors.
if finalErr != nil && !errors.Is(finalErr, define.ErrCtrStopped) &&
!errors.Is(finalErr, define.ErrCtrStateInvalid) {
if err := saveContainerError(c, finalErr); err != nil {
logrus.Debug(err)
}

9
test/e2e/inspect_test.go
View File

@ -583,6 +583,15 @@ var _ = Describe("Podman inspect", func() {
Expect(session).Should(ExitCleanly())
Expect(session.OutputToString()).To(BeEmpty())
// Stopping the container should be a NOP and not log an error in the state here.
session = podmanTest.Podman([]string{"container", "stop", cid})
session.WaitWithDefaultTimeout()
Expect(session).Should(ExitCleanly())
session = podmanTest.Podman([]string{"container", "inspect", cid, "-f", "{{ .State.Error }}"})
session.WaitWithDefaultTimeout()
Expect(session).Should(ExitCleanly())
Expect(session.OutputToString()).To(BeEmpty(), "state error after stop")
commandNotFound := "OCI runtime attempted to invoke a command that was not found"
session = podmanTest.Podman([]string{"start", cid})
session.WaitWithDefaultTimeout()