[adapters] Fix deadlock around catalog handle. #2450
Merged
Conversation
This file contains 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
gz
approved these changes
Sep 9, 2024
|
Best kind of mutex is no mutex! |
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
github-merge-queue
bot
removed this pull request from the merge queue due to no response for status checks
The circuit thread locked the catalog for much longer than needed, grabbing unrelated locks while holding the catalog lock and causing a deadlock. A simple fix would have been narrowing the critical section, but @gz pointed out that the catalog is only read after it is initially populated, so the mutex is not necessary. This commit refactors the code to eliminate the mutex around the catalog and enables previously disabled tests. Signed-off-by: Leonid Ryzhyk <leonid@feldera.com>
ryzhyk
force-pushed
the
catalog_race
branch
from
893114a
to
50f70d5
Compare
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.
The circuit thread locked the catalog for much longer than needed, grabbing unrelated locks while holding the catalog lock and causing a deadlock. A simple fix would have been narrowing the critical section, but @gz pointed out that the catalog is only read after it is initially populated, so the mutex is not necessary. This commit refactors the code to eliminate the mutex around the catalog and enables previously disabled tests.