github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-19 16:49:35 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #11562 from MikaelCluseau/master

Browse Source 
realContainerGC reports warning when err is nil
This commit is contained in:
Wojciech Tyczynski 2015-07-23 13:39:24 +02:00
commit 6524cd5e2a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/container_gc.go
View File

@ -207,7 +207,7 @@ func (cgc *realContainerGC) removeOldestN(containers []containerGCInfo, toRemove
} }
symlinkPath := dockertools.LogSymlink(cgc.containerLogsDir, containers[i].podNameWithNamespace, containers[i].containerName, containers[i].id) symlinkPath := dockertools.LogSymlink(cgc.containerLogsDir, containers[i].podNameWithNamespace, containers[i].containerName, containers[i].id)
err = os.Remove(symlinkPath) err = os.Remove(symlinkPath)
if !os.IsNotExist(err) { if err != nil && !os.IsNotExist(err) {
glog.Warningf("Failed to remove container %q log symlink %q: %v", containers[i].name, symlinkPath, err) glog.Warningf("Failed to remove container %q log symlink %q: %v", containers[i].name, symlinkPath, err)
} }
} }