mirror/runc
1
0
Fork 0
mirror of https://github.com/opencontainers/runc.git synced 2026-07-11 06:03:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

enhance runc delete command

Browse Source 
This patch enhance the `runc delete` command as following

1) when `runc delete` without one container-id

```
$ runc delete
runc: "delete" requires a minimum of 1 argument
```

2) we can delete more containers at one command

for example:

```
$ runc list
ID          PID         STATUS      BUNDLE         CREATED
a           8490        created     /mycontainer   2016-09-18T03:49:32.259760434Z
b           8520        running     /mycontainer   2016-09-18T03:49:36.999299944Z
c           8535        created     /mycontainer   2016-09-18T03:49:40.975277538Z
d           8549        created     /mycontainer   2016-09-18T03:49:42.675282602Z
e           8562        running     /mycontainer   2016-09-18T03:49:44.175400931Z
$ runc delete a b cc
cannot delete container b that is not stopped: running
container cc is not exist
$ runc list
ID          PID         STATUS      BUNDLE         CREATED
b           8520        running     /mycontainer   2016-09-18T03:49:36.999299944Z
c           8535        created     /mycontainer   2016-09-18T03:49:40.975277538Z
d           8549        created     /mycontainer   2016-09-18T03:49:42.675282602Z
e           8562        running     /mycontainer   2016-09-18T03:49:44.175400931Z
$ runc delete -f b c d e
$ runc list
ID          PID         STATUS      BUNDLE      CREATED
```

Signed-off-by: Wang Long <long.wanglong@huawei.com>
This commit is contained in:
Wang Long
2016-09-18 11:44:17 +08:00
parent 38e0df9ec6
commit d66ac3d9bd
1 changed files with 42 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
delete.go
+42 -23
View File
@@ -27,8 +27,8 @@ func killContainer(container libcontainer.Container) error {
var deleteCommand = cli.Command{ var deleteCommand = cli.Command{
Name: "delete", Name: "delete",
Usage: "delete any resources held by the container often used with detached containers", Usage: "delete any resources held by one container or more containers often used with detached containers",
ArgsUsage: `<container-id> ArgsUsage: `container-id [container-id...]
Where "<container-id>" is the name for the instance of the container. Where "<container-id>" is the name for the instance of the container.
@@ -45,32 +45,51 @@ status of "ubuntu01" as "stopped" the following will delete resources held for
}, },
}, },
Action: func(context *cli.Context) error { Action: func(context *cli.Context) error {
container, err := getContainer(context) if !context.Args().Present() {
if err != nil { return fmt.Errorf("runc: \"delete\" requires a minimum of 1 argument")
if lerr, ok := err.(libcontainer.Error); ok && lerr.Code() == libcontainer.ContainerNotExists {
// if there was an aborted start or something of the sort then the container's directory could exist but
// libcontainer does not see it because the state.json file inside that directory was never created.
path := filepath.Join(context.GlobalString("root"), context.Args().First())
if err := os.RemoveAll(path); err != nil {
return err
}
}
return nil
} }
s, err := container.Status()
factory, err := loadFactory(context)
if err != nil { if err != nil {
return err return err
} }
switch s { for _, id := range context.Args() {
case libcontainer.Stopped: container, err := factory.Load(id)
destroy(container) if err != nil {
case libcontainer.Created: if lerr, ok := err.(libcontainer.Error); ok && lerr.Code() == libcontainer.ContainerNotExists {
return killContainer(container) // if there was an aborted start or something of the sort then the container's directory could exist but
default: // libcontainer does not see it because the state.json file inside that directory was never created.
if context.Bool("force") { path := filepath.Join(context.GlobalString("root"), id)
return killContainer(container) if err := os.RemoveAll(path); err != nil {
fmt.Fprintf(os.Stderr, "remove %s: %v\n", path, err)
}
fmt.Fprintf(os.Stderr, "container %s is not exist\n", id)
}
continue
}
s, err := container.Status()
if err != nil {
fmt.Fprintf(os.Stderr, "status for %s: %v\n", id, err)
continue
}
switch s {
case libcontainer.Stopped:
destroy(container)
case libcontainer.Created:
err := killContainer(container)
if err != nil {
fmt.Fprintf(os.Stderr, "kill container %s: %v\n", id, err)
}
default:
if context.Bool("force") {
err := killContainer(container)
if err != nil {
fmt.Fprintf(os.Stderr, "kill container %s: %v\n", id, err)
}
} else {
fmt.Fprintf(os.Stderr, "cannot delete container %s that is not stopped: %s\n", id, s)
}
} }
return fmt.Errorf("cannot delete container that is not stopped: %s", s)
} }
return nil return nil
}, },