Fix perf standby elections when the new active node was also the prev…

…ious active node (#6561)
hashicorp · Apr 10, 2019 · 3cc5d05 · 3cc5d05
1 parent 76677bf
commit 3cc5d05
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/vault/ha.go b/vault/ha.go
@@ -646,6 +646,12 @@ func (c *Core) periodicLeaderRefresh(newLeaderCh chan func(), stopCh chan struct
 				lopCount := opCount
 				isLeader, _, newClusterAddr, _ := c.Leader()
 
+				// If we are the leader reset the clusterAddr since the next
+				// failover might go to the node that was previously active.
+				if isLeader {
+					clusterAddr = ""
+				}
+
 				if !isLeader && newClusterAddr != clusterAddr && newLeaderCh != nil {
 					select {
 					case newLeaderCh <- nil: