Merge pull request #29430 from lixiaobing10051267/masterBreak

Automatic merge from submit-queue To break the loop when object found in removeOrphanFinalizer() To break the loop when object found in removeOrphanFinalizer()

Merge pull request #29430 from lixiaobing10051267/masterBreak
3e41bc8d · k8s-merge-robot · GitHub · 696cca21 · 57eabf2b · 3e41bc8d
Commit 3e41bc8d authored Jul 23, 2016 by k8s-merge-robot Committed by GitHub Jul 23, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

garbagecollector.go pkg/controller/garbagecollector/garbagecollector.go +1 -0

No files found.
--- a/pkg/controller/garbagecollector/garbagecollector.go
+++ b/pkg/controller/garbagecollector/garbagecollector.go
@@ -279,6 +279,7 @@ func (gc *GarbageCollector) removeOrphanFinalizer(owner *node) error {
 		for _, f := range finalizers {
 			if f == api.FinalizerOrphan {
 				found = true
+				break
 			} else {
 				newFinalizers = append(newFinalizers, f)
 			}