diff options
author | baude <bbaude@redhat.com> | 2019-03-14 15:14:18 -0500 |
---|---|---|
committer | baude <bbaude@redhat.com> | 2019-03-22 14:58:44 -0500 |
commit | bb69004b8c799763b5e47f2e6b0f5bd77f6ca726 (patch) | |
tree | 63cf1b7421d7aaf0eec3a8cd60b04ea6dd642e7e /cmd/podman/shared | |
parent | 0458daf13d50e45bf9ca0ac03449c6ea60b2ef64 (diff) | |
download | podman-bb69004b8c799763b5e47f2e6b0f5bd77f6ca726.tar.gz podman-bb69004b8c799763b5e47f2e6b0f5bd77f6ca726.tar.bz2 podman-bb69004b8c799763b5e47f2e6b0f5bd77f6ca726.zip |
podman health check phase3
podman will not start a transient service and timer for healthchecks.
this handles the tracking of the timing for health checks.
added the 'started' status which represents the time that a container is
in its start-period.
the systemd timing can be disabled with an env variable of
DISABLE_HC_SYSTEMD="true".
added filter for ps where --filter health=[starting, healthy, unhealthy]
can now be used.
Signed-off-by: baude <bbaude@redhat.com>
Diffstat (limited to 'cmd/podman/shared')
-rw-r--r-- | cmd/podman/shared/create.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cmd/podman/shared/create.go b/cmd/podman/shared/create.go index 55eb3ce83..5ce0b8865 100644 --- a/cmd/podman/shared/create.go +++ b/cmd/podman/shared/create.go @@ -868,21 +868,21 @@ func makeHealthCheckFromCli(c *cliconfig.PodmanCommand) (*manifest.Schema2Health hc := manifest.Schema2HealthConfig{ Test: cmd, } + + if inInterval == "disable" { + inInterval = "0" + } intervalDuration, err := time.ParseDuration(inInterval) if err != nil { return nil, errors.Wrapf(err, "invalid healthcheck-interval %s ", inInterval) } - if intervalDuration < time.Duration(time.Second*1) { - return nil, errors.New("healthcheck-interval must be at least 1 second") - } - hc.Interval = intervalDuration if inRetries < 1 { return nil, errors.New("healthcheck-retries must be greater than 0.") } - + hc.Retries = int(inRetries) timeoutDuration, err := time.ParseDuration(inTimeout) if err != nil { return nil, errors.Wrapf(err, "invalid healthcheck-timeout %s", inTimeout) |