Fix data race in NNDescent::update()#5413
Open
RohanMali2003 wants to merge 5 commits into
Open
Conversation
other.pool.back() was read before acquiring other.lock, racing with concurrent pop_heap and push_heap calls in Nhood::insert(). Move the lock acquisition before the read in both rnn_new and rnn_old branches. Fixes issue facebookresearch#5276.
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
1 participant
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.
other.pool.back() was read before acquiring other.lock, racing with concurrent pop_heap and push_heap calls in Nhood::insert(). Moved the lock acquisition before the read in both rnn_new and rnn_old branches. Fixes issue #5276.
I was not able to build the project locally, so this change has not been compiled or run through the test suite. The fix mirrors the reordering proposed in the linked issue exactly, as proposed by reporter @wonder-fly : moving LockGuard guard(other.lock) before the other.pool.back() read in both the rnn_new and rnn_old branches. Happy to iterate based on CI results or review feedback. Thanks!