linux: skip errors from the runtime kill

fix a race condition where the container process could exit before the runtime sends the signal, causing the command to fail. Part of: containers/crun#422 Signed-off-by: Giuseppe Scrivano <[email protected]>
containers · Jul 9, 2020 · ddf7f01 · ddf7f01
1 parent 42e0fed
commit ddf7f01
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/run_linux.go b/run_linux.go
@@ -841,13 +841,8 @@ func runUsingRuntime(isolation Isolation, options RunOptions, configureNetwork b
 	stopped := false
 	defer func() {
 		if !stopped {
-			err2 := kill.Run()
-			if err2 != nil {
-				if err == nil {
-					err = errors.Wrapf(err2, "error stopping container")
-				} else {
-					logrus.Infof("error stopping container: %v", err2)
-				}
+			if err2 := kill.Run(); err2 != nil {
+				logrus.Infof("error stopping container: %v", err2)
 			}
 		}
 	}()