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

Merge pull request #8174 from Iceber/fix_ctr_run

Browse Source 
ctr: fix the cleanup of task
This commit is contained in:
Kazuyoshi Kato 2023-05-31 10:01:12 -07:00 committed by GitHub
commit 659a41fd85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/ctr/commands/run/run.go
View File

@ -29,6 +29,7 @@ import (
"github.com/containerd/containerd/cmd/ctr/commands"
"github.com/containerd/containerd/cmd/ctr/commands/tasks"
"github.com/containerd/containerd/containers"
"github.com/containerd/containerd/errdefs"
clabels "github.com/containerd/containerd/labels"
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/oci"
@ -170,7 +171,11 @@ var Command = cli.Command{
return err
}
if rm && !detach {
defer container.Delete(ctx, containerd.WithSnapshotCleanup)
defer func() {
if err := container.Delete(ctx, containerd.WithSnapshotCleanup); err != nil {
log.L.WithError(err).Error("failed to cleanup container")
}
}()
}
var con console.Console
if tty {
@ -199,10 +204,13 @@ var Command = cli.Command{
defer func() {
if enableCNI {
if err := network.Remove(ctx, commands.FullID(ctx, container), ""); err != nil {
log.L.WithError(err).Error("network review")
log.L.WithError(err).Error("failed to remove network")
}
}
task.Delete(ctx)
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 {

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
}