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

Merge pull request #13585 from flouthoc/fix-no-healthcheck 

healthcheck: stop showing wrong status when `--no-healthcheck` is set
This commit is contained in:
OpenShift Merge Robot 2022-03-22 14:44:26 +01:00 committed by GitHub
parent d0e9f28f87 6d6bdabc8c
commit 02aae4a658
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libpod/container_internal.go
View File

@ -1261,7 +1261,10 @@ func (c *Container) start() error {
} }
} }
if c.config.HealthCheckConfig != nil { // Check if healthcheck is not nil and --no-healthcheck option is not set.
// If --no-healthcheck is set Test will be always set to `[NONE]` so no need
// to update status in such case.
if c.config.HealthCheckConfig != nil && !(len(c.config.HealthCheckConfig.Test) == 1 && c.config.HealthCheckConfig.Test[0] == "NONE") {
if err := c.updateHealthStatus(define.HealthCheckStarting); err != nil { if err := c.updateHealthStatus(define.HealthCheckStarting); err != nil {
logrus.Error(err) logrus.Error(err)
} }

10
test/e2e/healthcheck_run_test.go
View File

@ -54,6 +54,16 @@ var _ = Describe("Podman healthcheck run", func() {
Expect(hc).Should(Exit(125)) Expect(hc).Should(Exit(125))
}) })
It("podman disable healthcheck with --no-healthcheck must not show starting on status", func() {
session := podmanTest.Podman([]string{"run", "-dt", "--no-healthcheck", "--name", "hc", healthcheck})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
hc := podmanTest.Podman([]string{"container", "inspect", "--format", "{{.State.Health.Status}}", "hc"})
hc.WaitWithDefaultTimeout()
Expect(hc).Should(Exit(0))
Expect(hc.OutputToString()).To(Not(ContainSubstring("starting")))
})
It("podman run healthcheck and logs should contain healthcheck output", func() { It("podman run healthcheck and logs should contain healthcheck output", func() {
session := podmanTest.Podman([]string{"run", "--name", "test-logs", "-dt", "--health-interval", "1s", "--health-cmd", "echo working", "busybox", "sleep", "3600"}) session := podmanTest.Podman([]string{"run", "--name", "test-logs", "-dt", "--health-interval", "1s", "--health-cmd", "echo working", "busybox", "sleep", "3600"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()