scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-10-30 18:17:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Address regression introduced by #15493 for non-raft storage backends. (#19721)

Browse Source
This commit is contained in:
Nick Cabatoff
2023-03-24 10:15:25 -04:00
committed by GitHub
parent 14eda8a178
commit e439289be5
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
changelog/19721.txt Normal file
View File

@@ -0,0 +1,3 @@
```release-note:bug
core: Fix regression breaking non-raft clusters whose nodes share the same cluster_addr/api_addr.
```

2
vault/ha.go
View File

@@ -238,7 +238,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 // 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 // disregarding it, we can avoid a panic in raft tests using the Inmem network
// layer when we try to connect back to ourself. // 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 return false, "", "", nil
} }