Merge pull request #254 from Microsoft/runc_kill_err

Fix issue with runc kill
microsoft · Aug 20, 2018 · f9d9074 · f9d9074
2 parents 4446ff2 + 843def1
commit f9d9074
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/service/gcs/runtime/runc/runc.go b/service/gcs/runtime/runc/runc.go
@@ -146,7 +146,9 @@ func (c *container) Kill(signal oslayer.Signal) error {
 	cmd := exec.Command("runc", "--log", logPath, "kill", c.id, strconv.Itoa(int(signal)))
 	out, err := cmd.CombinedOutput()
 	if err != nil {
-		return errors.Wrapf(err, "runc kill failed with: %s", out)
+		if !strings.Contains(err.Error(), "os: process already finished") {
+			return errors.Wrapf(err, "runc kill failed with: %s", out)
+		}
 	}
 	return nil
 }