github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #206 from Random-Liu/ensure-remove-all

Browse Source 
Use EnsureRemoveAll
This commit is contained in:
Mike Brown
2017-09-05 18:43:45 -05:00
committed by GitHub
parent cf391d82c3 adfabdaa35
commit 8a21e3f3c8
44 changed files with 1568 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/server/container_remove.go
View File

@@ -21,6 +21,7 @@ import (
"github.com/containerd/containerd"
"github.com/containerd/containerd/errdefs"
"github.com/docker/docker/pkg/system"
"github.com/golang/glog"
"golang.org/x/net/context"
"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
@@ -63,7 +64,7 @@ func (c *criContainerdService) RemoveContainer(ctx context.Context, r *runtime.R
// so we don't need the "Dead" state for now.
containerRootDir := getContainerRootDir(c.rootDir, id)
if err := c.os.RemoveAll(containerRootDir); err != nil {
if err := system.EnsureRemoveAll(containerRootDir); err != nil {
return nil, fmt.Errorf("failed to remove container root directory %q: %v",
containerRootDir, err)
}

3
pkg/server/sandbox_remove.go
View File

@@ -21,6 +21,7 @@ import (
"github.com/containerd/containerd"
"github.com/containerd/containerd/errdefs"
"github.com/docker/docker/pkg/system"
"github.com/golang/glog"
"golang.org/x/net/context"
"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
@@ -73,7 +74,7 @@ func (c *criContainerdService) RemovePodSandbox(ctx context.Context, r *runtime.
// Cleanup the sandbox root directory.
sandboxRootDir := getSandboxRootDir(c.rootDir, id)
if err := c.os.RemoveAll(sandboxRootDir); err != nil {
if err := system.EnsureRemoveAll(sandboxRootDir); err != nil {
return nil, fmt.Errorf("failed to remove sandbox root directory %q: %v",
sandboxRootDir, err)
}