Fix AsyncWorkQueue fork lock deadlock - #2
Merged
Conversation
ADovgalyuk
marked this pull request as ready for review
July 28, 2026 18:07
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.
Summary
Avoid acquiring the global fork read lock while holding
AsyncWorkQueue::m_mutex.Root cause
WorkerThreadMain()previously calledaeThreadOnline()while holdingm_mutex. This allowed the following cycle during BGSAVE/BGREWRITEAOF:m_mutexand waits for the fork read lock;m_mutex.The cycle prevents every participant from making progress.
Changes
m_mutex.m_mutexbeforeaeThreadOnline().m_mutexonly after the worker owns the fork read lock.The remaining lock order is consistently fork lock -> queue mutex; a worker blocked on the fork lock no longer prevents another worker from completing and releasing its read lock.
Validation
src/AsyncWorkQueue.cpp.Related upstream report: Snapchat#883.