Commit 9aa9fb0c authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub

Merge pull request #45014 from CaoShuFeng/unit_for_freed_image_size

Automatic merge from submit-queue (batch tested with PRs 43275, 45014, 46449, 46488, 46525) add unit for freed image size **Release note**: ```release-note NONE ```
parents 28996ac6 27dafbb8
...@@ -274,7 +274,7 @@ func (im *realImageGCManager) GarbageCollect() error { ...@@ -274,7 +274,7 @@ func (im *realImageGCManager) GarbageCollect() error {
} }
if freed < amountToFree { if freed < amountToFree {
err := fmt.Errorf("failed to garbage collect required amount of images. Wanted to free %d, but freed %d", amountToFree, freed) err := fmt.Errorf("failed to garbage collect required amount of images. Wanted to free %d bytes, but freed %d bytes", amountToFree, freed)
im.recorder.Eventf(im.nodeRef, v1.EventTypeWarning, events.FreeDiskSpaceFailed, err.Error()) im.recorder.Eventf(im.nodeRef, v1.EventTypeWarning, events.FreeDiskSpaceFailed, err.Error())
return err return err
} }
...@@ -347,7 +347,7 @@ func (im *realImageGCManager) freeSpace(bytesToFree int64, freeTime time.Time) ( ...@@ -347,7 +347,7 @@ func (im *realImageGCManager) freeSpace(bytesToFree int64, freeTime time.Time) (
} }
if len(deletionErrors) > 0 { 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, fmt.Errorf("wanted to free %d bytes, but freed %d bytes space with errors in image deletion: %v", bytesToFree, spaceFreed, errors.NewAggregate(deletionErrors))
} }
return spaceFreed, nil return spaceFreed, nil
} }
......
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