task delete: Closes task IO before waiting

claudiubelu · dcantah · commit bf02a8330f05 · 2021-10-15T16:25:50.000-07:00
After containerd restarts, it will try to recover its sandboxes, containers, and images. If it detects a task in the Created or Stopped state, it will be removed. This will cause the containerd process it hang on Windows on the t.io.Wait() call. Calling t.io.Close() beforehand will solve this issue. Additionally, the same issue occurs when trying to stopp a sandbox after containerd restarts. This will solve that case as well. Signed-off-by: Claudiu Belu <cbelu@cloudbasesolutions.com> (cherry picked from commit 55faa5e) Signed-off-by: Daniel Canter <dcanter@microsoft.com>
diff --git a/pkg/cri/io/helpers_windows.go b/pkg/cri/io/helpers_windows.go
@@ -52,6 +52,10 @@ func openPipe(ctx context.Context, fn string, flag int, perm os.FileMode) (io.Re
 		}
 		p.con = c
 	}()
+	go func() {
+		<-ctx.Done()
+		p.Close()
+	}()
 	return p, nil
 }
 
diff --git a/task.go b/task.go
@@ -315,6 +315,7 @@ func (t *task) Delete(ctx context.Context, opts ...ProcessDeleteOpts) (*ExitStat
 		return nil, errors.Wrapf(errdefs.ErrFailedPrecondition, "task must be stopped before deletion: %s", status.Status)
 	}
 	if t.io != nil {
+		t.io.Close()
 		t.io.Cancel()
 		t.io.Wait()
 	}

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,10 @@ func openPipe(ctx context.Context, fn string, flag int, perm os.FileMode) (io.Re`
`52`	`52`	`}`
`53`	`53`	`p.con = c`
`54`	`54`	`}()`
	`55`	`+ go func() {`
	`56`	`+ <-ctx.Done()`
	`57`	`+ p.Close()`
	`58`	`+ }()`
`55`	`59`	`return p, nil`
`56`	`60`	`}`
`57`	`61`
Original file line number	Diff line number	Diff line change
`@@ -315,6 +315,7 @@ func (t task) Delete(ctx context.Context, opts ...ProcessDeleteOpts) (ExitStat`
`315`	`315`	`return nil, errors.Wrapf(errdefs.ErrFailedPrecondition, "task must be stopped before deletion: %s", status.Status)`
`316`	`316`	`}`
`317`	`317`	`if t.io != nil {`
	`318`	`+ t.io.Close()`
`318`	`319`	`t.io.Cancel()`
`319`	`320`	`t.io.Wait()`
`320`	`321`	`}`