Merge pull request kubernetes#76004 from yue9944882/chore/trival-reserving-error-msg

k8s-ci-robot · web-flow · commit f83fcbefb64f · 2019-04-02T03:04:58.000-07:00
Fixes reversed owner relation in error msg from garbage collector
diff --git a/pkg/controller/garbagecollector/garbagecollector.go b/pkg/controller/garbagecollector/garbagecollector.go
@@ -457,7 +457,7 @@ func (gc *GarbageCollector) attemptToDeleteItem(item *node) error {
 
 	switch {
 	case len(solid) != 0:
-		klog.V(2).Infof("object %#v has at least one existing owner: %#v, will not garbage collect", solid, item.identity)
+		klog.V(2).Infof("object %#v has at least one existing owner: %#v, will not garbage collect", item.identity, solid)
 		if len(dangling) == 0 && len(waitingForDependentsDeletion) == 0 {
 			return nil
 		}

Original file line number	Diff line number	Diff line change
`@@ -457,7 +457,7 @@ func (gc GarbageCollector) attemptToDeleteItem(item node) error {`
`457`	`457`
`458`	`458`	`switch {`
`459`	`459`	`case len(solid) != 0:`
`460`		`- klog.V(2).Infof("object %#v has at least one existing owner: %#v, will not garbage collect", solid, item.identity)`
	`460`	`+ klog.V(2).Infof("object %#v has at least one existing owner: %#v, will not garbage collect", item.identity, solid)`
`461`	`461`	`if len(dangling) == 0 && len(waitingForDependentsDeletion) == 0 {`
`462`	`462`	`return nil`
`463`	`463`	`}`