backport of commit e439289 (hashicorp#19746)

fopina · Mar 24, 2023 · d622e81 · d622e81
1 parent 318ac8b
commit d622e81
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/changelog/19721.txt b/changelog/19721.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+core: Fix regression breaking non-raft clusters whose nodes share the same cluster_addr/api_addr.
+```
diff --git a/vault/ha.go b/vault/ha.go
@@ -235,7 +235,7 @@ func (c *Core) Leader() (isLeader bool, leaderAddr, clusterAddr string, err erro
 	// to ourself, there's no point in paying any attention to it.  And by
 	// disregarding it, we can avoid a panic in raft tests using the Inmem network
 	// layer when we try to connect back to ourself.
-	if adv.ClusterAddr == c.ClusterAddr() && adv.RedirectAddr == c.redirectAddr {
+	if adv.ClusterAddr == c.ClusterAddr() && adv.RedirectAddr == c.redirectAddr && c.getRaftBackend() != nil {
 		return false, "", "", nil
 	}