github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

ctr: fix the cleanup of task

Browse Source 
Signed-off-by: Iceber Gu <wei.cai-nat@daocloud.io>
This commit is contained in:
Iceber Gu
2023-02-28 10:16:56 +08:00
parent e52fbfd5c1
commit 3d9dd2022d
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/ctr/commands/tasks/start.go
View File

@@ -23,6 +23,7 @@ import (
"github.com/containerd/containerd"
"github.com/containerd/containerd/cio"
"github.com/containerd/containerd/cmd/ctr/commands"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/log"
"github.com/urfave/cli"
)
@@ -96,7 +97,12 @@ var startCommand = cli.Command{
}
var statusC <-chan containerd.ExitStatus
if !detach {
defer task.Delete(ctx)
defer func() {
if _, err := task.Delete(ctx, containerd.WithProcessKill); err != nil && !errdefs.IsNotFound(err) {
log.L.WithError(err).Error("failed to cleanup task")
}
}()
if statusC, err = task.Wait(ctx); err != nil {
return err
}