Fix global lock contention in DistClusterControllerStateModel caused by Optional.empty() singleton#3052
Merged
junkaixue merged 3 commits intoapache:masterfrom Mar 7, 2026
Conversation
…by Optional.empty() singleton
DistClusterControllerStateModel caused by Optional.empty() singleton
Contributor
Author
|
@junkaixue @GrantPSpencer Can you take a look at this? Thanks! |
laxman-ch
reviewed
Jun 30, 2025
helix-core/src/main/java/org/apache/helix/participant/DistClusterControllerStateModel.java
Outdated
Show resolved
Hide resolved
Contributor
GrantPSpencer
left a comment
There was a problem hiding this comment.
LGTM. Great catch on this, will greatly reduce topstate handoff when controller is processing multiple STs simultaneously
Just have 1 nit comment on test assertion
helix-core/src/test/java/org/apache/helix/participant/TestDistControllerStateModel.java
Outdated
Show resolved
Hide resolved
GrantPSpencer
approved these changes
Jul 7, 2025
Contributor
GrantPSpencer
left a comment
There was a problem hiding this comment.
LGTM
will still need committer approval, cc @junkaixue @xyuanlu
junkaixue
reviewed
Jul 7, 2025
helix-core/src/main/java/org/apache/helix/participant/DistClusterControllerStateModel.java
Show resolved
Hide resolved
Contributor
Author
|
Hey @junkaixue can you take a look at this again if you get time, Thanks a lot! |
3 tasks
3 tasks
Contributor
Author
|
Hey @junkaixue , @xyuanlu reminder on this one, Thanks for your time! |
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.
Issues
This PR fixes _controllerOpt getting shared across resources #3050 : _controllerOpt getting shared across resources
Description
Refer to _controllerOpt getting shared across resources #3050 for Problem description.
Basically, all DistClusterControllerStateModel instances were synchronizing on the same global lock object due to Optional.empty() returning a singleton instance.
Replaced synchronization on _controllerOpt (the shared singleton) with a dedicated per-instance lock object _controllerLock = new Object(). This eliminates cross-instance contention while preserving within-instance synchronization guarantees.
(Write a concise description including what, why, how)
Tests
The following tests are written for this issue:
Added a new test testNoSharedLockAcrossInstances
(List the names of added unit/integration tests)
The following is the result of the "mvn test" command on the appropriate module:
(If CI test fails due to known issue, please specify the issue and test PR locally. Then copy & paste the result of "mvn test" to here.)
Changes that Break Backward Compatibility (Optional)
(Consider including all behavior changes for public methods or API. Also include these changes in merge description so that other developers are aware of these changes. This allows them to make relevant code changes in feature branches accounting for the new method/API behavior.)
Documentation (Optional)
(Link the GitHub wiki you added)
Commits
Code Quality
(helix-style-intellij.xml if IntelliJ IDE is used)