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

Merge pull request #602 from mikebrow/critools-install-minor-update

Browse Source 
update critools
This commit is contained in:
Lantao Liu
2018-02-07 18:44:37 -08:00
committed by GitHub
parent 2acd6c1a5c edb2b2379d
commit 047df7aca6
7 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/server/instrumented_service.go
View File

@@ -71,7 +71,7 @@ func (in *instrumentedService) ListPodSandbox(ctx context.Context, r *runtime.Li
if err != nil {
logrus.WithError(err).Error("ListPodSandbox failed")
} else {
log.Tracef("ListPodSandbox returns sandboxes %+v", res.GetItems())
log.Tracef("ListPodSandbox returns pod sandboxes %+v", res.GetItems())
}
}()
return in.c.ListPodSandbox(ctx, r)

8
pkg/server/restart.go
View File

@@ -452,7 +452,7 @@ func cleanupOrphanedSandboxDirs(cntrs []containerd.Container, sandboxesRoot stri
// Cleanup orphaned sandbox directories.
dirs, err := ioutil.ReadDir(sandboxesRoot)
if err != nil && !os.IsNotExist(err) {
return fmt.Errorf("failed to read sandboxes directory %q: %v", sandboxesRoot, err)
return fmt.Errorf("failed to read pod sandboxes directory %q: %v", sandboxesRoot, err)
}
cntrsMap := make(map[string]containerd.Container)
for _, cntr := range cntrs {
@@ -460,7 +460,7 @@ func cleanupOrphanedSandboxDirs(cntrs []containerd.Container, sandboxesRoot stri
}
for _, d := range dirs {
if !d.IsDir() {
logrus.Warnf("Invalid file %q found in sandboxes directory", d.Name())
logrus.Warnf("Invalid file %q found in pod sandboxes directory", d.Name())
continue
}
if _, ok := cntrsMap[d.Name()]; ok {
@@ -469,9 +469,9 @@ func cleanupOrphanedSandboxDirs(cntrs []containerd.Container, sandboxesRoot stri
}
sandboxDir := filepath.Join(sandboxesRoot, d.Name())
if err := system.EnsureRemoveAll(sandboxDir); err != nil {
logrus.WithError(err).Warnf("Failed to remove sandbox directory %q", sandboxDir)
logrus.WithError(err).Warnf("Failed to remove pod sandbox directory %q", sandboxDir)
} else {
logrus.Debugf("Cleanup orphaned sandbox directory %q", sandboxDir)
logrus.Debugf("Cleanup orphaned pod sandbox directory %q", sandboxDir)
}
}
return nil