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

Merge pull request #16111 from vrothberg/healthcheck-fixes 

healthcheck: fix --on-failure=stop
This commit is contained in:
OpenShift Merge Robot 2022-10-11 10:06:05 -04:00 committed by GitHub
parent bb0b1849d7 4dd67272ed
commit 406616ddc1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libpod/container_internal.go
View File

@ -1285,12 +1285,6 @@ func (c *Container) stop(timeout uint) error {
c.lock.Unlock() c.lock.Unlock()
} }
if c.config.HealthCheckConfig != nil {
if err := c.removeTransientFiles(context.Background()); err != nil {
logrus.Error(err.Error())
}
}
stopErr := c.ociRuntime.StopContainer(c, timeout, all) stopErr := c.ociRuntime.StopContainer(c, timeout, all)
if !c.batched { if !c.batched {
@ -1415,6 +1409,11 @@ func (c *Container) restartWithTimeout(ctx context.Context, timeout uint) (retEr
if err := c.stop(timeout); err != nil { if err := c.stop(timeout); err != nil {
return err return err
} }
if c.config.HealthCheckConfig != nil {
if err := c.removeTransientFiles(context.Background()); err != nil {
logrus.Error(err.Error())
}
}
// Old versions of conmon have a bug where they create the exit file before // Old versions of conmon have a bug where they create the exit file before
// closing open file descriptors causing a race condition when restarting // closing open file descriptors causing a race condition when restarting
// containers with open ports since we cannot bind the ports as they're not // containers with open ports since we cannot bind the ports as they're not

2
test/system/220-healthcheck.bats
View File

@ -123,6 +123,8 @@ Log[-1].Output | \"Uh-oh on stdout!\\\nUh-oh on stderr!\"
# kill and stop yield the container into a non-running state # kill and stop yield the container into a non-running state
is "$output" ".* $policy" "container was stopped/killed" is "$output" ".* $policy" "container was stopped/killed"
assert "$output" != "running $policy" assert "$output" != "running $policy"
# also make sure that it's not stuck in the stopping state
assert "$output" != "stopping $policy"
fi fi
run_podman rm -f -t0 $ctr run_podman rm -f -t0 $ctr