Commit c9f58c0c authored by David Ashpole's avatar David Ashpole

dont return nil quantities when calling deleteImages, as this quantity is used regardless of err

parent ac627484
...@@ -1001,13 +1001,10 @@ func deleteImages(imageGC ImageGC, reportBytesFreed bool) nodeReclaimFunc { ...@@ -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
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment