Add check for customized resources in isEvacuatedFinished#3023
Open
proud-parselmouth wants to merge 4 commits intoapache:masterfrom
Open
Conversation
Contributor
|
Thanks for contributing to open source!
|
Merge master into dev
MarkGaox
reviewed
Apr 22, 2025
Comment on lines
137
to
139
| InstanceConfig instanceConfig = cache.getInstanceConfigMap().get(instance); | ||
| boolean isInstanceEvacuated = instanceConfig != null && | ||
| instanceConfig.getInstanceOperation().getOperation() == InstanceConstants.InstanceOperation.EVACUATE; |
Contributor
There was a problem hiding this comment.
Could we rename the boolean field toisAssignableForCustomizedResource? This will make it more extensible for future use.
Contributor
There was a problem hiding this comment.
I noticed that when an instance is offline but tagged EVACUATE, its partition isn’t dropped. This seems unintended because we should make it be consistent with the old behavior. Could we add a check to ensure nodes marked EVACUATE are live?
isAssignableForCustomizedResource = isLive && hasEvacuateTag
- Add isInstanceDrained method in HelixAdmin - Expose the method via instance update rest end point - Change the conditional checks order in isEvacuateFinished to improve latency
24bd881 to
86abe3f
Compare
junkaixue
reviewed
May 12, 2025
Comment on lines
+137
to
+140
| InstanceConfig instanceConfig = cache.getInstanceConfigMap().get(instance); | ||
| boolean hasEvacuatedOp = instanceConfig != null && | ||
| instanceConfig.getInstanceOperation().getOperation() == InstanceConstants.InstanceOperation.EVACUATE; | ||
| boolean isAssignableForCustomizedResource = cache.getLiveInstances().containsKey(instance) && hasEvacuatedOp; |
Contributor
There was a problem hiding this comment.
Can we leave custom rebalancer away with this logic currently? I think this requires a comprehensive design with custom rebalance users in open source.
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
(#200 - Link your issue number here: You can write "Fixes #XXX". Please use the proper keyword so that the issue gets closed automatically. See https://docs.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue
Any of the following keywords can be used: close, closes, closed, fix, fixes, fixed, resolve, resolves, resolved)
Description
isInstanceDrainedto check if the instance doesn't has any resource with rebalance mode full auto or customized in the current stateisInstanceDrainedcheck via API(Write a concise description including what, why, how)
Tests
The following tests are written for this issue:
TestInstanceOperation.testEvacuateWithCustomizedResource()TestCustomRebalancer.testDisabledBootstrappingPartitions()have been adjusted appropriatelyThe 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)