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

Log all image deletion errors instead of just the last one

Browse Source
This commit is contained in:
Ron Lai 2016-06-15 16:54:14 -07:00
parent 61a9358dbd
commit ed1444e47f
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/kubelet/image_manager.go
View File

@ -28,6 +28,7 @@ import (
"k8s.io/kubernetes/pkg/kubelet/cadvisor" "k8s.io/kubernetes/pkg/kubelet/cadvisor"
"k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/container"
kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
"k8s.io/kubernetes/pkg/util/errors"
"k8s.io/kubernetes/pkg/util/sets" "k8s.io/kubernetes/pkg/util/sets"
"k8s.io/kubernetes/pkg/util/wait" "k8s.io/kubernetes/pkg/util/wait"
) )
@ -273,7 +274,7 @@ func (im *realImageManager) freeSpace(bytesToFree int64, freeTime time.Time) (in
sort.Sort(byLastUsedAndDetected(images)) sort.Sort(byLastUsedAndDetected(images))
// Delete unused images until we've freed up enough space. // Delete unused images until we've freed up enough space.
var lastErr error var deletionErrors []error
spaceFreed := int64(0) spaceFreed := int64(0)
for _, image := range images { for _, image := range images {
glog.V(5).Infof("Evaluating image ID %s for possible garbage collection", image.id) glog.V(5).Infof("Evaluating image ID %s for possible garbage collection", image.id)
@ -295,7 +296,7 @@ func (im *realImageManager) freeSpace(bytesToFree int64, freeTime time.Time) (in
glog.Infof("[ImageManager]: Removing image %q to free %d bytes", image.id, image.size) glog.Infof("[ImageManager]: Removing image %q to free %d bytes", image.id, image.size)
err := im.runtime.RemoveImage(container.ImageSpec{Image: image.id}) err := im.runtime.RemoveImage(container.ImageSpec{Image: image.id})
if err != nil { if err != nil {
lastErr = err deletionErrors = append(deletionErrors, err)
continue continue
} }
delete(im.imageRecords, image.id) delete(im.imageRecords, image.id)
@ -306,7 +307,10 @@ func (im *realImageManager) freeSpace(bytesToFree int64, freeTime time.Time) (in
} }
} }
return spaceFreed, lastErr if len(deletionErrors) > 0 {
return spaceFreed, fmt.Errorf("wanted to free %d, but freed %d space with errors in image deletion: %v", bytesToFree, spaceFreed, errors.NewAggregate(deletionErrors))
}
return spaceFreed, nil
} }
type evictionInfo struct { type evictionInfo struct {