containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18267 from Luap99/always-stop 

libpod: stop containers with --restart=always
This commit is contained in:
OpenShift Merge Robot 2023-04-20 07:16:49 -04:00 committed by GitHub
parent 85d383bb35 edb64f8a76
commit f57020149a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libpod/container_api.go
View File

@ -254,14 +254,6 @@ func (c *Container) StopWithTimeout(timeout uint) (finalErr error) {
} }
} }
if c.ensureState(define.ContainerStateStopped, define.ContainerStateExited) {
return define.ErrCtrStopped
}
if !c.ensureState(define.ContainerStateCreated, define.ContainerStateRunning, define.ContainerStateStopping) {
return fmt.Errorf("can only stop created or running containers. %s is in state %s: %w", c.ID(), c.state.State.String(), define.ErrCtrStateInvalid)
}
return c.stop(timeout) return c.stop(timeout)
} }

42
libpod/container_internal.go
View File

@ -238,6 +238,11 @@ func (c *Container) shouldRestart() bool {
} }
} }
// Explicitly stopped by user, do not restart again.
if c.state.StoppedByUser {
return false
}
// If we did not get a restart policy match, return false // If we did not get a restart policy match, return false
// Do the same if we're not a policy that restarts. // Do the same if we're not a policy that restarts.
if !c.state.RestartPolicyMatch || if !c.state.RestartPolicyMatch ||
@ -1307,15 +1312,38 @@ func (c *Container) stop(timeout uint) error {
} }
} }
// Set the container state to "stopping" and unlock the container // OK, the following code looks a bit weird but we have to make sure we can stop
// before handing it over to conmon to unblock other commands. #8501 // containers with the restart policy always, to do this we have to set
// demonstrates nicely that a high stop timeout will block even simple // StoppedByUser even when there is nothing to stop right now. This is due to the
// commands such as `podman ps` from progressing if the container lock // cleanup process waiting on the container lock and then afterwards restarts it.
// is held when busy-waiting for the container to be stopped. // shouldRestart() then checks for StoppedByUser and does not restart it.
// https://github.com/containers/podman/issues/18259
var cannotStopErr error
if c.ensureState(define.ContainerStateStopped, define.ContainerStateExited) {
cannotStopErr = define.ErrCtrStopped
} else if !c.ensureState(define.ContainerStateCreated, define.ContainerStateRunning, define.ContainerStateStopping) {
cannotStopErr = fmt.Errorf("can only stop created or running containers. %s is in state %s: %w", c.ID(), c.state.State.String(), define.ErrCtrStateInvalid)
}
c.state.StoppedByUser = true c.state.StoppedByUser = true
c.state.State = define.ContainerStateStopping if cannotStopErr == nil {
// Set the container state to "stopping" and unlock the container
// before handing it over to conmon to unblock other commands. #8501
// demonstrates nicely that a high stop timeout will block even simple
// commands such as `podman ps` from progressing if the container lock
// is held when busy-waiting for the container to be stopped.
c.state.State = define.ContainerStateStopping
}
if err := c.save(); err != nil { if err := c.save(); err != nil {
return fmt.Errorf("saving container %s state before stopping: %w", c.ID(), err) rErr := fmt.Errorf("saving container %s state before stopping: %w", c.ID(), err)
if cannotStopErr == nil {
return rErr
}
// we return below with cannotStopErr
logrus.Error(rErr)
}
if cannotStopErr != nil {
return cannotStopErr
} }
if !c.batched { if !c.batched {
c.lock.Unlock() c.lock.Unlock()