opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-19 16:33:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19760 from giuseppe/print-stderr-only-after-checking-state

Browse Source 
oci: print stderr only after checking state
This commit is contained in:
OpenShift Merge Robot
2023-08-28 16:10:50 +02:00
committed by GitHub
parent 009ff3af69 4b347609d6
commit 44986f5b10
1 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
libpod/oci_conmon_common.go
View File

@ -420,22 +420,6 @@ func (r *ConmonOCIRuntime) StopContainer(ctr *Container, timeout uint, all bool)
killCtr := func(signal uint) (bool, error) { killCtr := func(signal uint) (bool, error) {
stderr, err := r.killContainer(ctr, signal, all, true) stderr, err := r.killContainer(ctr, signal, all, true)
// Before handling error from KillContainer, convert STDERR to a []string
// (one string per line of output) and print it, ignoring known OCI runtime
// errors that we don't care about
stderrLines := strings.Split(stderr.String(), "\n")
for _, line := range stderrLines {
if line == "" {
continue
}
if strings.Contains(line, "container not running") || strings.Contains(line, "open pidfd: No such process") || strings.Contains(line, "kill container: No such process") {
logrus.Debugf("Failure to kill container (already stopped?): logged %s", line)
continue
}
fmt.Fprintf(os.Stderr, "%s\n", line)
}
if err != nil { if err != nil {
// There's an inherent race with the cleanup process (see // There's an inherent race with the cleanup process (see
// #16142, #17142). If the container has already been marked as // #16142, #17142). If the container has already been marked as
@ -461,6 +445,16 @@ func (r *ConmonOCIRuntime) StopContainer(ctr *Container, timeout uint, all bool)
return false, err return false, err
} }
// Before handling error from KillContainer, convert STDERR to a []string
// (one string per line of output) and print it.
stderrLines := strings.Split(stderr.String(), "\n")
for _, line := range stderrLines {
if line != "" {
fmt.Fprintf(os.Stderr, "%s\n", line)
}
}
return false, nil return false, nil
} }