containerd-shim-kata-v2: cleanup all of the containers in a sandbox

There are maybe more than one containers in a sandbox, thus it's needed to cleanup all of those containers' mount and id mapping files when do cleanup a sandbox. Fixes: kata-containers#572 Signed-off-by: fupan <[email protected]>
hyperhq · Aug 10, 2018 · 8fdf25e · 8fdf25e
1 parent 76ffe80
commit 8fdf25e
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 11 deletions.
diff --git a/cli/containerd-shim-kata-v2/main.go b/cli/containerd-shim-kata-v2/main.go
@@ -1,4 +1,7 @@
-
+// Copyright (c) 2018 HyperHQ Inc.
+//
+// SPDX-License-Identifier: Apache-2.0
+//
 
 package main
 

diff --git a/containerd-shim/kata/create.go b/containerd-shim/kata/create.go
@@ -14,8 +14,8 @@ import (
 	vc "github.com/kata-containers/runtime/virtcontainers"
 	vf "github.com/kata-containers/runtime/virtcontainers/factory"
 	"github.com/kata-containers/runtime/virtcontainers/pkg/oci"
-	"github.com/sirupsen/logrus"
 	"github.com/opencontainers/runtime-spec/specs-go"
+	"github.com/sirupsen/logrus"
 )
 
 func create(s *service, containerID, bundlePath, netns string, detach bool,

diff --git a/containerd-shim/kata/oci.go b/containerd-shim/kata/oci.go
@@ -172,11 +172,11 @@ func delContainerIDMapping(containerID string) error {
 	return os.RemoveAll(path)
 }
 
-func removeNameSpace(s *oci.CompatOCISpec, nsType specs.LinuxNamespaceType){
+func removeNameSpace(s *oci.CompatOCISpec, nsType specs.LinuxNamespaceType) {
 	for i, n := range s.Linux.Namespaces {
 		if n.Type == nsType {
 			s.Linux.Namespaces = append(s.Linux.Namespaces[:i], s.Linux.Namespaces[i+1:]...)
 			return
 		}
 	}
-}
+}
diff --git a/containerd-shim/kata/service.go b/containerd-shim/kata/service.go
@@ -28,11 +28,11 @@ import (
 	"github.com/containerd/containerd/runtime/v2/runc/options"
 	"github.com/containerd/typeurl"
 	ptypes "github.com/gogo/protobuf/types"
+	"github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/sys/unix"
 	"path/filepath"
-	"github.com/opencontainers/runtime-spec/specs-go"
 )
 
 const bufferSize = 32
@@ -266,16 +266,25 @@ func (s *service) Cleanup(ctx context.Context) (*taskAPI.DeleteResponse, error)
 		return nil, errdefs.ToGRPCf(errdefs.ErrInvalidArgument, "the container id is empty, please specify the container id")
 	}
 
+	var containers []vc.VCContainer
+
 	path, err := os.Getwd()
 	if err != nil {
 		return nil, err
 	}
 
-	status, err := vci.StatusSandbox(s.id)
+	//get the bundle parent path, thus we can form a specific
+	//container's bundle path by "bundleParentPath/id"
+	bundleParentPath := filepath.Dir(path)
+
+	sandbox, err := vci.FetchSandbox(s.id)
 	if err != nil {
 		return nil, err
 	}
 
+	containers = sandbox.GetAllContainers()
+	status := sandbox.Status()
+
 	if oci.StateToOCIState(status.State) != oci.StateStopped {
 		if _, err := vci.StopSandbox(s.id); err != nil {
 			logrus.WithError(err).Warn("failed to stop kata container")
@@ -286,12 +295,15 @@ func (s *service) Cleanup(ctx context.Context) (*taskAPI.DeleteResponse, error)
 		logrus.WithError(err).Warn("failed to remove kata container")
 	}
 
-	if err := delContainerIDMapping(s.id); err != nil {
-		logrus.WithError(err).Warn("failed to remove kata container id mapping files")
-	}
+	for _, c := range containers {
+		if err := delContainerIDMapping(s.id); err != nil {
+			logrus.WithError(err).Warnf("failed to remove kata container %s id mapping files", c.ID())
+		}
 
-	if err := mount.UnmountAll(filepath.Join(path, "rootfs"), 0); err != nil {
-		logrus.WithError(err).Warn("failed to cleanup rootfs mount")
+		rootfs := filepath.Join(bundleParentPath, c.ID(), "rootfs")
+		if err := mount.UnmountAll(rootfs, 0); err != nil {
+			logrus.WithError(err).Warnf("failed to cleanup container %s rootfs mount", c.ID())
+		}
 	}
 
 	return &taskAPI.DeleteResponse{