[Fix] Address deadlock issue during leader stepdown#530
Open
gu0keno0 wants to merge 9 commits into
Open
Conversation
This was referenced May 3, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Refs:
#531
#323
We observed the following braft's deadlock issue:
th1:
th2:
...
Thread-1 was performing step-down while thread-2 was trying to apply, thread-1 was spinning on push_rq because there was a spike of other operations running on bthreads around the same time. Therefore, thread-1 was holding NodeImpl.mutex while waiting. Meanwhile, thread-2 was trying to grab NodeImpl.mutex and cannot get it because thread-1 was holding it. Because thread-2 couldn't finish the bthread, no free bthread slot can be freed up, so thread-1 had to spin further on push_rq, causing a deadlock.
When this deadlock happens, braft completely freezes.
This PR moves the scheduling of the "done" closures to be outside of the critical session of NodeImpl.mutex. The new code only drains the closures and append them into a local RAII guard when NodeImpl.mutex was being held; the guard will schedule the closures when NodeImpl.mutex is released. The ordering is guaranteed by constructing the guard before taking the mutex.
Tests: