Merge pull request #563 from jiazhang0/fix-force-rm

k8s-ci-robot · web-flow · commit dba49fb2907f · 2019-12-15T17:41:37.000-08:00
Fix removal of container forcibly
diff --git a/cmd/crictl/container.go b/cmd/crictl/container.go
@@ -304,7 +304,7 @@ var removeContainerCommand = cli.Command{
 			}
 			if resp.GetStatus().GetState() == pb.ContainerState_CONTAINER_RUNNING {
 				if ctx.Bool("force") {
-					if err := RemoveContainer(runtimeClient, id); err != nil {
+					if err := StopContainer(runtimeClient, id, 0); err != nil {
 						logrus.Errorf("stopping the container %q failed: %v", id, err)
 						errored = true
 						continue

Original file line number	Diff line number	Diff line change
`@@ -304,7 +304,7 @@ var removeContainerCommand = cli.Command{`
`304`	`304`	`}`
`305`	`305`	`if resp.GetStatus().GetState() == pb.ContainerState_CONTAINER_RUNNING {`
`306`	`306`	`if ctx.Bool("force") {`
`307`		`- if err := RemoveContainer(runtimeClient, id); err != nil {`
	`307`	`+ if err := StopContainer(runtimeClient, id, 0); err != nil {`
`308`	`308`	`logrus.Errorf("stopping the container %q failed: %v", id, err)`
`309`	`309`	`errored = true`
`310`	`310`	`continue`