Merge pull request #3419 from AkihiroSuda/fix-task-start

crosbymichael · web-flow · commit 063a4ff27844 · 2019-07-17T09:56:50.000-04:00
runtime/v1/linux: ignore ErrCgroupDeleted in Task.Start
diff --git a/runtime/v1/linux/task.go b/runtime/v1/linux/task.go
@@ -124,11 +124,15 @@ func (t *Task) Start(ctx context.Context) error {
 	t.pid = int(r.Pid)
 	if !hasCgroup {
 		cg, err := cgroups.Load(cgroups.V1, cgroups.PidPath(t.pid))
-		if err != nil {
+		if err != nil && err != cgroups.ErrCgroupDeleted {
 			return err
 		}
 		t.mu.Lock()
-		t.cg = cg
+		if err == cgroups.ErrCgroupDeleted {
+			t.cg = nil
+		} else {
+			t.cg = cg
+		}
 		t.mu.Unlock()
 	}
 	t.events.Publish(ctx, runtime.TaskStartEventTopic, &eventstypes.TaskStart{
