github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-13 13:46:46 +00:00
Code Issues Projects Releases Wiki Activity

shimv2: trust cached status when deleting containers

Browse Source 
vc status might not be accurate because it does not watch container
status change.

Signed-off-by: Peng Tao <bergwolf@hyper.sh>
This commit is contained in:
Peng Tao 2020-09-15 19:23:03 +08:00
parent 325a4f868d
commit 6487044fa1
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/runtime/containerd-shim-v2/delete.go
View File

@ -9,25 +9,21 @@ import (
"context" "context"
"path" "path"
"github.com/containerd/containerd/api/types/task"
"github.com/containerd/containerd/mount" "github.com/containerd/containerd/mount"
"github.com/kata-containers/kata-containers/src/runtime/pkg/katautils" "github.com/kata-containers/kata-containers/src/runtime/pkg/katautils"
"github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types"
) )
func deleteContainer(ctx context.Context, s *service, c *container) error { func deleteContainer(ctx context.Context, s *service, c *container) error {
status, err := s.sandbox.StatusContainer(c.id) if !c.cType.IsSandbox() {
if err != nil && !isNotFound(err) { if c.status != task.StatusStopped {
return err _, err := s.sandbox.StopContainer(c.id, false)
}
if !c.cType.IsSandbox() && err == nil {
if status.State.State != types.StateStopped {
_, err = s.sandbox.StopContainer(c.id, false)
if err != nil { if err != nil {
return err return err
} }
} }
if _, err = s.sandbox.DeleteContainer(c.id); err != nil { if _, err := s.sandbox.DeleteContainer(c.id); err != nil {
return err return err
} }
} }