mirror of
https://github.com/containers/podman.git
synced 2025-06-21 01:19:15 +08:00
Merge pull request #14830 from vrothberg/fix-14761
Sync: handle exit file
This commit is contained in:
@ -761,20 +761,9 @@ 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 {
|
||||
if err := c.syncContainer(); 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
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
defer c.newContainerEvent(events.Sync)
|
||||
return nil
|
||||
|
@ -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
|
||||
|
Reference in New Issue
Block a user