Merge pull request containerd#3841 from apostasie/fix-3840

Fix journald logger exit and wait behavior

Author: AkihiroSuda

pkg/logging/journald_logger.go

@@ -173,12 +173,21 @@ func FetchLogs(stdout, stderr io.Writer, journalctlArgs []string, stopChannel ch
 	}
 
 	// Setup killing goroutine:
+	killed := false
 	go func() {
 		<-stopChannel
+		killed = true
 		log.L.Debugf("killing journalctl logs process with PID: %#v", cmd.Process.Pid)
 		cmd.Process.Kill()
 	}()
 
+	err = cmd.Wait()
+	if exitError, ok := err.(*exec.ExitError); ok {
+		if !killed && exitError.ExitCode() != 0 {
+			return fmt.Errorf("journalctl command exited with non-zero exit code (%d): %w", exitError.ExitCode(), exitError)
+		}
+	}
+
 	return nil
 }