Merge pull request #937 from bcwaldon/rem-ttl

engine: set TTL based on obsolete lease
coreos · Oct 2, 2014 · fd2ceeb · fd2ceeb
2 parents f010db9 + 66ba5d7
commit fd2ceeb
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/engine/engine.go b/engine/engine.go
@@ -155,7 +155,8 @@ func acquireLeadership(lReg registry.LeaseRegistry, machID string, ver int, ttl
 		return nil
 	}
 
-	l, err = lReg.StealLease(engineLeaseName, machID, ver, ttl, existing.Index())
+	rem := existing.TimeRemaining()
+	l, err = lReg.StealLease(engineLeaseName, machID, ver, ttl+rem, existing.Index())
 	if err != nil {
 		log.Errorf("Engine leadership steal failed: %v", err)
 		return nil
@@ -166,7 +167,6 @@ func acquireLeadership(lReg registry.LeaseRegistry, machID string, ver int, ttl
 
 	log.Infof("Stole engine leadership from Machine(%s)", existing.MachineID())
 
-	rem := existing.TimeRemaining()
 	if rem > 0 {
 		log.Infof("Waiting %v for previous lease to expire before continuing reconciliation", rem)
 		<-time.After(rem)