From 322839ac7568038a85db79db9e880d9de351c77a Mon Sep 17 00:00:00 2001 From: Feng Wang Date: Wed, 1 Jun 2022 13:14:20 -0700 Subject: [PATCH] runtime: force stop container after the container process exits MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Set thestop container force flag to true so that the container state is always set to “StateStopped” after the container wait goroutine is finished. This is necessary for the following delete container step to succeed. Fixes: #4359 Signed-off-by: Feng Wang --- src/runtime/pkg/containerd-shim-v2/wait.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/runtime/pkg/containerd-shim-v2/wait.go b/src/runtime/pkg/containerd-shim-v2/wait.go index 0f6c4fe066..5e86149c1a 100644 --- a/src/runtime/pkg/containerd-shim-v2/wait.go +++ b/src/runtime/pkg/containerd-shim-v2/wait.go @@ -78,7 +78,7 @@ func wait(ctx context.Context, s *service, c *container, execID string) (int32, shimLog.WithField("sandbox", s.sandbox.ID()).Error("failed to delete sandbox") } } else { - if _, err = s.sandbox.StopContainer(ctx, c.id, false); err != nil { + if _, err = s.sandbox.StopContainer(ctx, c.id, true); err != nil { shimLog.WithError(err).WithField("container", c.id).Warn("stop container failed") } }