Merge pull request #25071 from zhouhaibing089/clock-fix

allow equality to avoid flaky on clock
This commit is contained in:
Robert Bailey 2016-05-06 14:10:43 -07:00
commit d9a4e9b49c

View File

@ -267,7 +267,7 @@ func (im *realImageManager) freeSpace(bytesToFree int64, freeTime time.Time) (in
spaceFreed := int64(0)
for _, image := range images {
// Images that are currently in used were given a newer lastUsed.
if image.lastUsed.After(freeTime) {
if image.lastUsed.Equal(freeTime) || image.lastUsed.After(freeTime) {
break
}