Merge pull request #49980 from caesarxuchao/gc-minor

Automatic merge from submit-queue (batch tested with PRs 49237, 49656, 49980, 49841, 49899) GC shouldn't send empty patch The scope of the `if` statement was wrong, causing GC to sometimes send empty patch. Found this bug while investigating https://github.com/kubernetes/kubernetes/issues/49966.

Merge pull request #49980 from caesarxuchao/gc-minor
cba21511 · Kubernetes Submit Queue · GitHub · 09388343 · 3060e925 · cba21511
Commit cba21511 authored Aug 02, 2017 by Kubernetes Submit Queue Committed by GitHub Aug 02, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

garbagecollector.go pkg/controller/garbagecollector/garbagecollector.go +3 -2

No files found.
--- a/pkg/controller/garbagecollector/garbagecollector.go
+++ b/pkg/controller/garbagecollector/garbagecollector.go
@@ -390,9 +390,10 @@ func (gc *GarbageCollector) attemptToDeleteItem(item *node) error {
 	switch {
 	case len(solid) != 0:
 		glog.V(2).Infof("object %s has at least one existing owner: %#v, will not garbage collect", solid, item.identity)
-		if len(dangling) != 0 || len(waitingForDependentsDeletion) != 0 {
+		if len(dangling) == 0 && len(waitingForDependentsDeletion) == 0 {
-			glog.V(2).Infof("remove dangling references %#v and waiting references %#v for object %s", dangling, waitingForDependentsDeletion, item.identity)
+			return nil
 		}
+		glog.V(2).Infof("remove dangling references %#v and waiting references %#v for object %s", dangling, waitingForDependentsDeletion, item.identity)
 		// waitingForDependentsDeletion needs to be deleted from the
 		// ownerReferences, otherwise the referenced objects will be stuck with
 		// the FinalizerDeletingDependents and never get deleted.