Repository navigation
Fix: Recursive Read Lock Deadlock in GetSFWContentMode - #7300
Open
hoanle0126 wants to merge 1 commit into
Open
hoanle0126 wants to merge 1 commit into
hoanle0126 wants to merge 1 commit into
Conversation
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.
Description
Config.GetSFWContentMode()acquiredi.RLock()and then calledi.getBool(SFWContentMode), which also acquiresi.RLock()on the samesync.RWMutex. Because Go'ssync.RWMutexblocks newRLockcalls once a writer is waiting onLock, any config write arriving between the outer and innerRLockcausedGetSFWContentModeand the pending writer to deadlock.Removing the redundant outer
RLock/RUnlockfromGetSFWContentModeresolves the recursive read lock and matches the rest of the typed config getters.Related Issue
fixes: #7293
Testing
Added
i.SetInterface(SFWContentMode, i.GetSFWContentMode())toTestConcurrentConfigAccess(which timed out in<1sprior to the fix) and verified withgo test -race ./internal/manager/config/....Screenshots
NA
Checklist
AI Usage Disclosure
Used AI coding assistant to help write the concurrency test reproduction and draft the PR description.
Additional Context