opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-22 01:48:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14533 from mheon/avoid_error_on_container_stop

Browse Source 
Do not error on signalling a just-stopped container
This commit is contained in:
OpenShift Merge Robot
2022-06-09 12:54:04 -04:00
committed by GitHub
parent 852a406851 c77691f06f
commit fd1d0d67fb
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libpod/oci_conmon_linux.go
View File

@ -411,8 +411,8 @@ func (r *ConmonOCIRuntime) KillContainer(ctr *Container, signal uint, all bool)
if err2 := r.UpdateContainerStatus(ctr); err2 != nil { if err2 := r.UpdateContainerStatus(ctr); err2 != nil {
logrus.Infof("Error updating status for container %s: %v", ctr.ID(), err2) logrus.Infof("Error updating status for container %s: %v", ctr.ID(), err2)
} }
if ctr.state.State == define.ContainerStateExited { if ctr.ensureState(define.ContainerStateStopped, define.ContainerStateExited) {
return nil return define.ErrCtrStateInvalid
} }
return errors.Wrapf(err, "error sending signal to container %s", ctr.ID()) return errors.Wrapf(err, "error sending signal to container %s", ctr.ID())
} }