Merge pull request #32007 from caesarxuchao/gc-retry

Automatic merge from submit-queue

[GarbageCollector] GC retries failed garbage collection

The code was buried in #30483, which we decided to put off to 1.5.
This commit is contained in:
Kubernetes Submit Queue 2016-09-02 18:13:18 -07:00 committed by GitHub
commit 0e5b777ded

View File

@ -581,6 +581,9 @@ func (gc *GarbageCollector) worker() {
err := gc.processItem(timedItem.Object.(*node))
if err != nil {
utilruntime.HandleError(fmt.Errorf("Error syncing item %#v: %v", timedItem.Object, err))
// retry if garbage collection of an object failed.
gc.dirtyQueue.Add(timedItem)
return
}
DirtyProcessingLatency.Observe(sinceInMicroseconds(gc.clock, timedItem.StartTime))
}