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

Add support for retry count with --restart flag

Browse Source 
The on-failure restart option supports restarting only a given
number of times. To do this, we need one additional field in the
DB to track restart count (which conveniently fills a field in
Inspect we weren't populating), plus some plumbing logic.

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
This commit is contained in:
Matthew Heon
2019-04-01 19:20:03 -04:00
parent dc42304f38
commit f4db6d5cf6
6 changed files with 39 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libpod/container_api.go
View File

@ -57,11 +57,11 @@ func (c *Container) Init(ctx context.Context) (err error) {
if c.state.State == ContainerStateStopped {
// Reinitialize the container
return c.reinit(ctx)
return c.reinit(ctx, false)
}
// Initialize the container for the first time
return c.init(ctx)
return c.init(ctx, false)
}
// Start starts a container.
@ -605,13 +605,13 @@ func (c *Container) Cleanup(ctx context.Context) error {
// restart the container.
// However, perform a full validation of restart policy first.
if c.state.RestartPolicyMatch {
// if restart policy is on-error and exit code is 0, we do
// nothing.
// TODO: if restart retries is set, handle that here.
if c.config.RestartRetries != 0 {
return errors.Wrapf(ErrNotImplemented, "restart retries not yet implemented")
if c.config.RestartPolicy == "on-failure" && 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 == "on-error" && c.state.ExitCode == 0) || c.config.RestartPolicy == "always" {
if (c.config.RestartPolicy == "on-failure" && c.state.ExitCode != 0 &&
(c.config.RestartRetries > 0 && c.state.RestartCount < c.config.RestartRetries)) ||
c.config.RestartPolicy == "always" {
// The container stopped. We need to restart it.
return c.handleRestartPolicy(ctx)
}
@ -780,7 +780,7 @@ func (c *Container) Refresh(ctx context.Context) error {
if err := c.prepare(); err != nil {
return err
}
if err := c.init(ctx); err != nil {
if err := c.init(ctx, false); err != nil {
return err
}
}