diff options
| author | Valentin Rothberg <vrothberg@redhat.com> | 2022-07-05 12:18:27 +0200 |
|---|---|---|
| committer | Valentin Rothberg <vrothberg@redhat.com> | 2022-07-05 12:32:02 +0200 |
| commit | b9aa4755559d50d39bee3f571734a1e17c0f08b2 (patch) | |
| tree | 0f1bb2ecf5809a7ca8a92b182a56afd22d8d8a1a | |
| parent | 773eead54e2e0877e92d5871625a6cc32c582d30 (diff) | |
| download | podman-b9aa4755559d50d39bee3f571734a1e17c0f08b2.tar.gz podman-b9aa4755559d50d39bee3f571734a1e17c0f08b2.tar.bz2 podman-b9aa4755559d50d39bee3f571734a1e17c0f08b2.zip | |
Sync: handle exit file
Make sure `Sync()` handles state transitions and exit codes correctly.
The function was only being called when batching which could render
containers in an unusable state when running concurrently with other
state-altering functions/commands since the state must be re-read from
the database before acting upon it.
Fixes: #14761
Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
| -rw-r--r-- | libpod/container_api.go | 15 | ||||
| -rw-r--r-- | test/system/130-kill.bats | 10 |
2 files changed, 12 insertions, 13 deletions
diff --git a/libpod/container_api.go b/libpod/container_api.go index f35cce772..39303eef6 100644 --- a/libpod/container_api.go +++ b/libpod/container_api.go @@ -761,19 +761,8 @@ func (c *Container) Sync() error { defer c.lock.Unlock() } - // If runtime knows about the container, update its status in runtime - // And then save back to disk - if c.ensureState(define.ContainerStateCreated, define.ContainerStateRunning, define.ContainerStatePaused, define.ContainerStateStopped, define.ContainerStateStopping) { - oldState := c.state.State - if err := c.ociRuntime.UpdateContainerStatus(c); err != nil { - return err - } - // Only save back to DB if state changed - if c.state.State != oldState { - if err := c.save(); err != nil { - return err - } - } + if err := c.syncContainer(); err != nil { + return err } defer c.newContainerEvent(events.Sync) diff --git a/test/system/130-kill.bats b/test/system/130-kill.bats index a9456e03c..96b633a42 100644 --- a/test/system/130-kill.bats +++ b/test/system/130-kill.bats @@ -130,4 +130,14 @@ load helpers is "$output" $cname } +@test "podman kill - concurrent stop" { + # 14761 - concurrent kill/stop must record the exit code + random_name=$(random_string 10) + run_podman run -d --replace --name=$random_name alpine sh -c "trap 'echo Received SIGTERM, ignoring' SIGTERM; echo READY; while :; do sleep 0.2; done" + $PODMAN stop -t 1 $random_name & + run_podman kill $random_name + run_podman wait $random_name + run_podman rm -f $random_name +} + # vim: filetype=sh |