fix(bigtable): resolve deadlock in ClientConfigurationManager when notifying callbacks#13192
Merged
gcf-merge-on-green[bot] merged 1 commit intoMay 14, 2026
Conversation
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Code Review
This pull request refactors the locking strategy in ClientConfigurationManager to prevent deadlocks by moving listener notifications outside of synchronized blocks and simplifying listener management with a volatile closed flag. A new test case, testDeadlockPrevention, validates these changes. However, the reviewer identified potential race conditions in handleFailedFetch and setClientConfiguration where state checks and updates are no longer atomic, which could lead to inconsistent configurations or out-of-order notifications.
mutianf
approved these changes
May 14, 2026
igorbernstein2
added
the
automerge
…tifying callbacks Resolve a circular dependency deadlock between ClientConfigurationManagerand SessionPoolImpl monitor locks. - Release the ClientConfigurationManager lock before executing listener callbacks. - Remove synchronized from setClientConfiguration and handleFailedFetch signatures,restricting synchronization to direct field updates. - Simplify concurrency design by introducing a volatile closed flag onListenerEntry, making notifying state and pendingListenerRemovals redundant.
igorbernstein2
force-pushed
the
client-config-race
branch
from
506c9d7 to
acd0b74
Compare
gcf-merge-on-green
Bot
merged commit c98e53d
into
googleapis:main
179 of 182 checks passed
gcf-merge-on-green
Bot
removed
the
automerge
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
2 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.
Resolve a circular dependency deadlock between ClientConfigurationManagerand SessionPoolImpl monitor locks.