Merge pull request #14662 from marun/fix-leaderelection-logging

smarterclayton · web-flow · commit fcccc624056a · 2017-06-14T23:31:43.000-04:00
Fix leader election logging
diff --git a/pkg/cmd/server/origin/leaderelection.go b/pkg/cmd/server/origin/leaderelection.go
@@ -133,7 +133,10 @@ func legacyLeaderElectionStart(id, name string, leased *plug.Leased, lock rl.Int
 				leased.Stop(nil)
 				return true, nil
 			}
-			utilruntime.HandleError(fmt.Errorf("unable to confirm %s lease exists: %v", name, err))
+			// NotFound indicates the endpoint is missing and the etcd lease should continue to be held
+			if !kapierrors.IsNotFound(err) {
+				utilruntime.HandleError(fmt.Errorf("unable to confirm %s lease exists: %v", name, err))
+			}
 			return false, nil
 		})
 	}

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,10 @@ func legacyLeaderElectionStart(id, name string, leased *plug.Leased, lock rl.Int`
`133`	`133`	`leased.Stop(nil)`
`134`	`134`	`return true, nil`
`135`	`135`	`}`
`136`		`- utilruntime.HandleError(fmt.Errorf("unable to confirm %s lease exists: %v", name, err))`
	`136`	`+ // NotFound indicates the endpoint is missing and the etcd lease should continue to be held`
	`137`	`+ if !kapierrors.IsNotFound(err) {`
	`138`	`+ utilruntime.HandleError(fmt.Errorf("unable to confirm %s lease exists: %v", name, err))`
	`139`	`+ }`
`137`	`140`	`return false, nil`
`138`	`141`	`})`
`139`	`142`	`}`