Need to revoke leadership to clean up in case there was a failure dur…

…ing leadership establishment
hashicorp · Feb 20, 2018 · f1877e3 · f1877e3
1 parent a62f8ae
commit f1877e3
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/nomad/leader.go b/nomad/leader.go
@@ -107,8 +107,16 @@ RECONCILE:
 	if !establishedLeader {
 		if err := s.establishLeadership(stopCh); err != nil {
 			s.logger.Printf("[ERR] nomad: failed to establish leadership: %v", err)
+
+			// Immediately revoke leadership since we didn't successfully
+			// establish leadership.
+			if err := s.revokeLeadership(); err != nil {
+				s.logger.Printf("[ERR] nomad: failed to revoke leadership: %v", err)
+			}
+
 			goto WAIT
 		}
+
 		establishedLeader = true
 		defer func() {
 			if err := s.revokeLeadership(); err != nil {