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

Merge pull request #2207 from jessvalarezo/ctr-task-d-update

Browse Source 
ctr: allow for force kill when deleting task process
This commit is contained in:
Phil Estes 2018-03-14 03:41:23 -04:00 committed by GitHub
commit b307df2723
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cmd/ctr/commands/tasks/delete.go
View File

@ -17,14 +17,21 @@
package tasks package tasks
import ( import (
"github.com/containerd/containerd"
"github.com/containerd/containerd/cmd/ctr/commands" "github.com/containerd/containerd/cmd/ctr/commands"
"github.com/urfave/cli" "github.com/urfave/cli"
) )
var deleteCommand = cli.Command{ var deleteCommand = cli.Command{
Name: "delete", Name: "delete",
Usage: "delete a task", Usage: "[flags] delete a task",
ArgsUsage: "CONTAINER", ArgsUsage: "CONTAINER",
Flags: []cli.Flag{
cli.BoolFlag{
Name: "force, f",
Usage: "force delete task process",
},
},
Action: func(context *cli.Context) error { Action: func(context *cli.Context) error {
client, ctx, cancel, err := commands.NewClient(context) client, ctx, cancel, err := commands.NewClient(context)
if err != nil { if err != nil {
@ -35,11 +42,16 @@ var deleteCommand = cli.Command{
if err != nil { if err != nil {
return err return err
} }
task, err := container.Task(ctx, nil) task, err := container.Task(ctx, nil)
if err != nil { if err != nil {
return err return err
} }
status, err := task.Delete(ctx) var opts []containerd.ProcessDeleteOpts
if context.Bool("force") {
opts = append(opts, containerd.WithProcessKill)
}
status, err := task.Delete(ctx, opts...)
if err != nil { if err != nil {
return err return err
} }