Update acquire to use newer JitterUntil vs. sleep with 0 timer which may

have caused a race in Until.
kubernetes · Jul 29, 2016 · 9a02bff · 9a02bff
1 parent 9fab05f
commit 9a02bff
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pkg/client/leaderelection/OWNERS b/pkg/client/leaderelection/OWNERS
@@ -1,2 +1,3 @@
 assignees:
   - mikedanese
+  - timothysc
diff --git a/pkg/client/leaderelection/leaderelection.go b/pkg/client/leaderelection/leaderelection.go
@@ -203,18 +203,17 @@ func (le *LeaderElector) IsLeader() bool {
 // acquire loops calling tryAcquireOrRenew and returns immediately when tryAcquireOrRenew succeeds.
 func (le *LeaderElector) acquire() {
 	stop := make(chan struct{})
-	wait.Until(func() {
+	wait.JitterUntil(func() {
 		succeeded := le.tryAcquireOrRenew()
 		le.maybeReportTransition()
 		if !succeeded {
 			glog.V(4).Infof("failed to renew lease %v/%v", le.config.EndpointsMeta.Namespace, le.config.EndpointsMeta.Name)
-			time.Sleep(wait.Jitter(le.config.RetryPeriod, JitterFactor))
 			return
 		}
 		le.config.EventRecorder.Eventf(&api.Endpoints{ObjectMeta: le.config.EndpointsMeta}, api.EventTypeNormal, "%v became leader", le.config.Identity)
 		glog.Infof("sucessfully acquired lease %v/%v", le.config.EndpointsMeta.Namespace, le.config.EndpointsMeta.Name)
 		close(stop)
-	}, 0, stop)
+	}, le.config.RetryPeriod, JitterFactor, true, stop)
 }
 
 // renew loops calling tryAcquireOrRenew and returns immediately when tryAcquireOrRenew fails.