diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-05-13 19:45:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-13 19:45:21 +0200 |
| commit | e0f123056581e399b6c0d0282462164d8b8957c5 (patch) | |
| tree | b9f40fd80877e9a71fbe1fba841f4f9bc13c0be3 | |
| parent | 2ded1f6199b59c09268ca59de6903a30ac110201 (diff) | |
| parent | c71761b9ba9310d2be4453c9dcd14c2ccaacfd6e (diff) | |
| download | podman-e0f123056581e399b6c0d0282462164d8b8957c5.tar.gz podman-e0f123056581e399b6c0d0282462164d8b8957c5.tar.bz2 podman-e0f123056581e399b6c0d0282462164d8b8957c5.zip | |
Merge pull request #3093 from baude/healthcheckfixes
healthcheck benign error
| -rw-r--r-- | libpod/healthcheck_linux.go | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/libpod/healthcheck_linux.go b/libpod/healthcheck_linux.go index 869605ea8..d47a3b7cd 100644 --- a/libpod/healthcheck_linux.go +++ b/libpod/healthcheck_linux.go @@ -4,6 +4,7 @@ import ( "fmt" "os" "os/exec" + "strings" "github.com/coreos/go-systemd/dbus" "github.com/pkg/errors" @@ -61,7 +62,13 @@ func (c *Container) removeTimer() error { return errors.Wrapf(err, "unable to get systemd connection to remove healthchecks") } defer conn.Close() - serviceFile := fmt.Sprintf("%s.timer", c.ID()) - _, err = conn.StopUnit(serviceFile, "fail", nil) + timerFile := fmt.Sprintf("%s.timer", c.ID()) + _, err = conn.StopUnit(timerFile, "fail", nil) + + // We want to ignore errors where the timer unit has already been removed. The error + // return is generic so we have to check against the string in the error + if err != nil && strings.HasSuffix(err.Error(), ".timer not loaded.") { + return nil + } return err } |