Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix a Deadlock on HA leadership transfer #12691

Merged
merged 2 commits into from Oct 4, 2021
Merged

Fix a Deadlock on HA leadership transfer #12691

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b517db9
Fix a Deadlock on HA leadership transfer when standby
hghaf099 Sep 30, 2021
4f167da
adding the changelog
hghaf099 Sep 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion vault/request_forwarding.go
View file
Open in desktop
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 @@ -372,7 +375,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