github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-06 02:34:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #45990 from dashpole/fix_gc

Browse Source 
Automatic merge from submit-queue

[Bug Fix] Return quantity freed even when an error exists

bug was added by #44986.  If we get an error from deleteImages, we try and use the bytes freed in a calculation.
That PR changed the behavior from evicting a pod upon error, to panicking because of the nil pointer.

This should fix inode eviction tests

/assign @dchen1107
This commit is contained in:
Kubernetes Submit Queue 2017-05-17 18:03:59 -07:00 committed by GitHub
commit 7f183142de
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/kubelet/eviction/helpers.go
View File

@ -1001,13 +1001,10 @@ func deleteImages(imageGC ImageGC, reportBytesFreed bool) nodeReclaimFunc {
return func() (*resource.Quantity, error) { return func() (*resource.Quantity, error) {
glog.Infof("eviction manager: attempting to delete unused images") glog.Infof("eviction manager: attempting to delete unused images")
bytesFreed, err := imageGC.DeleteUnusedImages() bytesFreed, err := imageGC.DeleteUnusedImages()
if err != nil {
return nil, err
}
reclaimed := int64(0) reclaimed := int64(0)
if reportBytesFreed { if reportBytesFreed {
reclaimed = bytesFreed reclaimed = bytesFreed
} }
return resource.NewQuantity(reclaimed, resource.BinarySI), nil return resource.NewQuantity(reclaimed, resource.BinarySI), err
} }
} }