upstream/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2026-02-18 18:38:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

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
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show stats 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
// 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
}