opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-27 21:50:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12634 from baude/bz2024229

Browse Source 
Removed .service file for healthchecks
This commit is contained in:
OpenShift Merge Robot
2021-12-17 02:25:49 +01:00
committed by GitHub
parent 52d5f367b1 e88c21366d
commit c9a3f4ec44
3 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libpod/container_internal.go
View File

@ -1877,7 +1877,7 @@ func (c *Container) cleanupStorage() error {
return cleanupErr return cleanupErr
} }
// Unmount the a container and free its resources // Unmount the container and free its resources
func (c *Container) cleanup(ctx context.Context) error { func (c *Container) cleanup(ctx context.Context) error {
var lastError error var lastError error
@ -1885,7 +1885,7 @@ func (c *Container) cleanup(ctx context.Context) error {
// Remove healthcheck unit/timer file if it execs // Remove healthcheck unit/timer file if it execs
if c.config.HealthCheckConfig != nil { if c.config.HealthCheckConfig != nil {
if err := c.removeTimer(); err != nil { if err := c.removeTransientFiles(ctx); err != nil {
logrus.Errorf("Removing timer for container %s healthcheck: %v", c.ID(), err) logrus.Errorf("Removing timer for container %s healthcheck: %v", c.ID(), err)
} }
} }

24
libpod/healthcheck_linux.go
View File

@ -1,6 +1,7 @@
package libpod package libpod
import ( import (
"context"
"fmt" "fmt"
"os" "os"
"os/exec" "os/exec"
@ -59,9 +60,9 @@ func (c *Container) startTimer() error {
return err return err
} }
// removeTimer removes the systemd timer and unit files // removeTransientFiles removes the systemd timer and unit files
// for the container // for the container
func (c *Container) removeTimer() error { func (c *Container) removeTransientFiles(ctx context.Context) error {
if c.disableHealthCheckSystemd() { if c.disableHealthCheckSystemd() {
return nil return nil
} }
@ -71,12 +72,19 @@ func (c *Container) removeTimer() error {
} }
defer conn.Close() defer conn.Close()
timerFile := fmt.Sprintf("%s.timer", c.ID()) timerFile := fmt.Sprintf("%s.timer", c.ID())
_, err = conn.StopUnit(timerFile, "fail", nil) serviceFile := fmt.Sprintf("%s.service", c.ID())
// We want to ignore errors where the timer unit and/or service unit has already
// We want to ignore errors where the timer unit has already been removed. The error // been removed. The error return is generic so we have to check against the
// return is generic so we have to check against the string in the error // string in the error
if err != nil && strings.HasSuffix(err.Error(), ".timer not loaded.") { if _, err = conn.StopUnitContext(ctx, serviceFile, "fail", nil); err != nil {
return nil if !strings.HasSuffix(err.Error(), ".service not loaded.") {
return errors.Wrapf(err, "unable to remove service file")
}
}
if _, err = conn.StopUnitContext(ctx, timerFile, "fail", nil); err != nil {
if strings.HasSuffix(err.Error(), ".timer not loaded.") {
return nil
}
} }
return err return err
} }

16
test/e2e/healthcheck_run_test.go
View File

@ -242,4 +242,20 @@ var _ = Describe("Podman healthcheck run", func() {
Expect(ps.OutputToStringArray()).To(HaveLen(2)) Expect(ps.OutputToStringArray()).To(HaveLen(2))
Expect(ps.OutputToString()).To(ContainSubstring("hc")) Expect(ps.OutputToString()).To(ContainSubstring("hc"))
}) })
It("stopping and then starting a container with healthcheck cmd", func() {
session := podmanTest.Podman([]string{"run", "-dt", "--name", "hc", "--health-cmd", "[\"ls\", \"/foo\"]", ALPINE, "top"})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
stop := podmanTest.Podman([]string{"stop", "-t0", "hc"})
stop.WaitWithDefaultTimeout()
Expect(stop).Should(Exit(0))
startAgain := podmanTest.Podman([]string{"start", "hc"})
startAgain.WaitWithDefaultTimeout()
Expect(startAgain).Should(Exit(0))
Expect(startAgain.OutputToString()).To(Equal("hc"))
Expect(startAgain.ErrorToString()).To(Equal(""))
})
}) })