Skip to content

Commit

Permalink
Fix a Deadlock on HA leadership transfer (#12691) (#12721)
Browse files Browse the repository at this point in the history
* Fix a Deadlock on HA leadership transfer when standby
was actively forwarding a request
fixes GH #12601

* adding the changelog
  • Loading branch information
hghaf099 committed Oct 4, 2021
1 parent da1e0cd commit f0d5e3a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
3 changes: 3 additions & 0 deletions changelog/12691.txt
@@ -0,0 +1,3 @@
```release-note:bug
core: Fix a deadlock on HA leadership transfer
```
5 changes: 4 additions & 1 deletion vault/request_forwarding.go
Expand Up @@ -329,6 +329,9 @@ func (c *Core) clearForwardingClients() {
// ForwardRequest forwards a given request to the active node and returns the
// response.
func (c *Core) ForwardRequest(req *http.Request) (int, http.Header, []byte, error) {
// checking if the node is perfStandby here to avoid a deadlock between
// Core.stateLock and Core.requestForwardingConnectionLock
isPerfStandby := c.PerfStandby()
c.requestForwardingConnectionLock.RLock()
defer c.requestForwardingConnectionLock.RUnlock()

Expand Down Expand Up @@ -369,7 +372,7 @@ func (c *Core) ForwardRequest(req *http.Request) (int, http.Header, []byte, erro
// If we are a perf standby and the request was forwarded to the active node
// we should attempt to wait for the WAL to ship to offer best effort read after
// write guarantees
if c.PerfStandby() && resp.LastRemoteWal > 0 {
if isPerfStandby && resp.LastRemoteWal > 0 {
WaitUntilWALShipped(req.Context(), c, resp.LastRemoteWal)
}

Expand Down

0 comments on commit f0d5e3a

Please sign in to comment.