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

Address review comments on restart policy

Browse Source 
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
This commit is contained in:
Matthew Heon
2019-05-03 10:35:48 -04:00
parent e1443fe05d
commit d7c367aa61
5 changed files with 54 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
libpod/container_api.go
View File

@ -601,23 +601,18 @@ func (c *Container) Cleanup(ctx context.Context) error {
return errors.Wrapf(ErrCtrStateInvalid, "container %s is running or paused, refusing to clean up", c.ID())
}
// If we have a restart policy match when updating the state, we need to
// restart the container.
// However, perform a full validation of restart policy first.
if c.state.RestartPolicyMatch {
if c.config.RestartPolicy == RestartPolicyOnFailure && c.state.ExitCode != 0 {
logrus.Debugf("Container %s restart policy trigger: on retry %d (of %d)",
c.ID(), c.state.RestartCount, c.config.RestartRetries)
}
if (c.config.RestartPolicy == RestartPolicyOnFailure && c.state.ExitCode != 0 &&
(c.config.RestartRetries > 0 && c.state.RestartCount < c.config.RestartRetries)) ||
c.config.RestartPolicy == RestartPolicyAlways {
// The container stopped. We need to restart it.
return c.handleRestartPolicy(ctx)
}
// Handle restart policy.
// Returns a bool indicating whether we actually restarted.
// If we did, don't proceed to cleanup - just exit.
didRestart, err := c.handleRestartPolicy(ctx)
if err != nil {
return err
}
if didRestart {
return nil
}
// If we aren't hitting restart policy, we perform a normal cleanup
// If we didn't restart, we perform a normal cleanup
// Check if we have active exec sessions
if len(c.state.ExecSessions) != 0 {