Reorder rlock/runlock to prevent mutex locking#5633
Merged
mattdurham merged 6 commits intografana:mainfrom Sep 10, 2025
Merged
Conversation
mattdurham
changed the title
mattdurham
requested review from
carles-grafana,
electron0zero,
ie-pham,
javiermolinar,
joe-elliott,
mapno,
mdisibio,
ruslan-mikhailov,
stoewer,
yvrhdn and
zalegrala
as code owners
joe-elliott
reviewed
Sep 9, 2025
| return nil | ||
| } | ||
|
|
||
| i.blocksMtx.RLock() |
Collaborator
There was a problem hiding this comment.
we should leave this in iterateBlocks() and just remove the lock in QueryRange. are you saying the livestore still locks with that change?
Contributor
There was a problem hiding this comment.
+1, I think it's simpler code if locking is in iterateBlocks()
mattdurham
force-pushed
the
resolve_recursive_locking
branch
from
f5db76e to
3bf5d25
Compare
joe-elliott
approved these changes
Sep 10, 2025
mapno
approved these changes
Sep 10, 2025
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
3 participants
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.
Removed the blocking out of iterateBlocks and depend on the parent blocking. Its not the most intuitive but this is a relatively low rate of code change to fix the issue. The alternative would be for the mutex to be only in iterate blocks a but that makes it easier to recreate the issue.
The committed offset is totally unrelated but it really jams up the logs.