diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-22 05:34:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-22 05:34:17 -0400 |
| commit | c0998f728a9a6d9344bdacb4d4820ea36e132f44 (patch) | |
| tree | b9fe92f61be5901c55a4cf4beac216311847dd4b /libpod | |
| parent | 344a791ac2019b078dd334ef0a492ee37fe0a937 (diff) | |
| parent | 90e547ec1a0cacd2e2b5f2365972cb26484026a2 (diff) | |
| download | podman-c0998f728a9a6d9344bdacb4d4820ea36e132f44.tar.gz podman-c0998f728a9a6d9344bdacb4d4820ea36e132f44.tar.bz2 podman-c0998f728a9a6d9344bdacb4d4820ea36e132f44.zip | |
Merge pull request #7040 from mheon/no_exec_errmsg
Do not print an error message on non-0 exec exit code
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/container_exec.go | 4 | ||||
| -rw-r--r-- | libpod/healthcheck.go | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/libpod/container_exec.go b/libpod/container_exec.go index bd04ee9b9..a16aea06d 100644 --- a/libpod/container_exec.go +++ b/libpod/container_exec.go @@ -729,10 +729,6 @@ func (c *Container) Exec(config *ExecConfig, streams *define.AttachStreams, resi return -1, err } - if exitCode != 0 { - return exitCode, errors.Wrapf(define.ErrOCIRuntime, "exec session exited with non-zero exit code %d", exitCode) - } - return exitCode, nil } diff --git a/libpod/healthcheck.go b/libpod/healthcheck.go index b04742974..4818f8dc4 100644 --- a/libpod/healthcheck.go +++ b/libpod/healthcheck.go @@ -92,7 +92,7 @@ func (c *Container) runHealthCheck() (define.HealthCheckStatus, error) { hcResult := define.HealthCheckSuccess config := new(ExecConfig) config.Command = newCommand - _, hcErr := c.Exec(config, streams, nil) + exitCode, hcErr := c.Exec(config, streams, nil) if hcErr != nil { errCause := errors.Cause(hcErr) hcResult = define.HealthCheckFailure @@ -104,6 +104,9 @@ func (c *Container) runHealthCheck() (define.HealthCheckStatus, error) { } else { returnCode = 125 } + } else if exitCode != 0 { + hcResult = define.HealthCheckFailure + returnCode = 1 } timeEnd := time.Now() if c.HealthCheckConfig().StartPeriod > 0 { |