Procházet zdrojové kódy

libcontainerd/supervisor: explicitly ignore process kill errors

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sebastiaan van Stijn před 1 rokem
rodič
revize
178125ae39

+ 2 - 3
libcontainerd/supervisor/remote_daemon.go

@@ -209,9 +209,8 @@ func (r *remote) startContainerd() error {
 		r.logger.WithError(err).Warn("failed to adjust OOM score")
 	}
 
-	err = pidfile.Write(r.pidFile, r.daemonPid)
-	if err != nil {
-		process.Kill(r.daemonPid)
+	if err := pidfile.Write(r.pidFile, r.daemonPid); err != nil {
+		_ = process.Kill(r.daemonPid)
 		return errors.Wrap(err, "libcontainerd: failed to save daemon pid to disk")
 	}
 

+ 2 - 2
libcontainerd/supervisor/remote_daemon_linux.go

@@ -49,9 +49,9 @@ func (r *remote) stopDaemon() {
 
 func (r *remote) killDaemon() {
 	// Try to get a stack trace
-	syscall.Kill(r.daemonPid, syscall.SIGUSR1)
+	_ = syscall.Kill(r.daemonPid, syscall.SIGUSR1)
 	<-time.After(100 * time.Millisecond)
-	process.Kill(r.daemonPid)
+	_ = process.Kill(r.daemonPid)
 }
 
 func (r *remote) platformCleanup() {

+ 1 - 1
libcontainerd/supervisor/remote_daemon_windows.go

@@ -40,7 +40,7 @@ func (r *remote) stopDaemon() {
 }
 
 func (r *remote) killDaemon() {
-	process.Kill(r.daemonPid)
+	_ = process.Kill(r.daemonPid)
 }
 
 func (r *remote) platformCleanup() {