You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@helix.apache.org by "frankmu (via GitHub)" <gi...@apache.org> on 2024/08/22 21:57:02 UTC
[PR] Move existing assignments usage calculation to pre-process stage [helix]
frankmu opened a new pull request, #2888:
URL: https://github.com/apache/helix/pull/2888
### Issues
- [x] My PR addresses the following Helix issues and references them in the PR description:
resolves #2822
### Description
- [x] Here are some details about my PR, including screenshots of any UI changes:
One of the key steps of sticky rebalance strategy is to populate the previous node usage based on current mapping. Previous we do this in rebalance stage where we don't have the node usage info from global view. e.g. if the nodeA has resource1, then in rebalance stage of resource2, we don't have this info anymore. This PR moves the existing assignments usage calculation to pre-process stage where we will have the global view for all resources.
### Tests
- [x] The following tests are written for this issue:
`helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestStickyRebalanceStrategy.java`
- The following is the result of the "mvn test" command on the appropriate module:
```
mvn test -o -Dtest=TestStickyRebalanceStrategy -pl=helix-core
...
[INFO] Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 61.9 s - in TestSuite
[INFO]
[INFO] Results:
[INFO]
[INFO] Tests run: 9, Failures: 0, Errors: 0, Skipped: 0
[INFO]
[INFO]
[INFO] --- jacoco:0.8.6:report (generate-code-coverage-report) @ helix-core ---
[INFO] Loading execution data file /Users/tmu/projects/helix/helix-core/target/jacoco.exec
[INFO] Analyzed bundle 'Apache Helix :: Core' with 961 classes
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
...
mvn test -o -Dtest=TestStickyRebalanceWithGlobalPerInstancePartitionLimit -pl=helix-core
...
[INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 19.285 s - in org.apache.helix.integration.rebalancer.TestStickyRebalanceWithGlobalPerInstancePartitionLimit
[INFO]
[INFO] Results:
[INFO]
[INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
[INFO]
[INFO]
[INFO] --- jacoco:0.8.6:report (generate-code-coverage-report) @ helix-core ---
[INFO] Loading execution data file /Users/tmu/projects/helix/helix-core/target/jacoco.exec
[INFO] Analyzed bundle 'Apache Helix :: Core' with 961 classes
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
```
### Changes that Break Backward Compatibility (Optional)
- My PR contains changes that break backward compatibility or previous assumptions for certain methods or API. They include:
(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)
- In case of new functionality, my PR adds documentation in the following wiki page:
(Link the GitHub wiki you added)
### Commits
- My commits all reference appropriate Apache Helix GitHub issues in their subject lines. In addition, my commits follow the guidelines from "[How to write a good git commit message](http://chris.beams.io/posts/git-commit/)":
1. Subject is separated from body by a blank line
1. Subject is limited to 50 characters (not including Jira issue reference)
1. Subject does not end with a period
1. Subject uses the imperative mood ("add", not "adding")
1. Body wraps at 72 characters
1. Body explains "what" and "why", not "how"
### Code Quality
- My diff has been formatted using helix-style.xml
(helix-style-intellij.xml if IntelliJ IDE is used)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@helix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@helix.apache.org
For additional commands, e-mail: reviews-help@helix.apache.org
Re: [PR] Move existing assignments usage calculation to pre-process stage [helix]
Posted by "junkaixue (via GitHub)" <gi...@apache.org>.
junkaixue commented on code in PR #2888:
URL: https://github.com/apache/helix/pull/2888#discussion_r1736649432
##########
helix-core/src/main/java/org/apache/helix/controller/dataproviders/ResourceControllerDataProvider.java:
##########
@@ -583,6 +586,37 @@ public Set<CapacityNode> getSimpleCapacitySet() {
return _simpleCapacitySet;
}
+ public void populateSimpleCapacitySetUsage(final Set<String> resourceNameSet,
+ final CurrentStateOutput currentStateOutput) {
+ // Convert the assignableNodes to map for quick lookup
+ Map<String, CapacityNode> simpleCapacityMap = new HashMap<>();
+ for (CapacityNode node : _simpleCapacitySet) {
+ simpleCapacityMap.put(node.getId(), node);
+ }
Review Comment:
If you are just build snapshot of the map for keys, you can directly do:
Map<String, CapacityNode> simpleCapacityMap = new HashMap<>(_simpleCapacitySet);
##########
helix-core/src/main/java/org/apache/helix/controller/dataproviders/ResourceControllerDataProvider.java:
##########
@@ -583,6 +586,37 @@ public Set<CapacityNode> getSimpleCapacitySet() {
return _simpleCapacitySet;
}
+ public void populateSimpleCapacitySetUsage(final Set<String> resourceNameSet,
+ final CurrentStateOutput currentStateOutput) {
+ // Convert the assignableNodes to map for quick lookup
+ Map<String, CapacityNode> simpleCapacityMap = new HashMap<>();
+ for (CapacityNode node : _simpleCapacitySet) {
+ simpleCapacityMap.put(node.getId(), node);
+ }
+ for (String resourceName : resourceNameSet) {
+ // Process current state mapping
+ for (Map.Entry<Partition, Map<String, String>> entry : currentStateOutput.getCurrentStateMap(
+ resourceName).entrySet()) {
+ for (String instanceName : entry.getValue().keySet()) {
+ CapacityNode node = simpleCapacityMap.get(instanceName);
+ if (node != null) {
+ node.canAdd(resourceName, entry.getKey().getPartitionName());
+ }
+ }
+ }
+ // Process pending state mapping
+ for (Map.Entry<Partition, Map<String, Message>> entry : currentStateOutput.getPendingMessageMap(
+ resourceName).entrySet()) {
+ for (String instanceName : entry.getValue().keySet()) {
+ CapacityNode node = simpleCapacityMap.get(instanceName);
+ if (node != null) {
+ node.canAdd(resourceName, entry.getKey().getPartitionName());
+ }
+ }
+ }
Review Comment:
This code is redundant.
You can have a private function with argument for the map to process with same logic and hook twice here.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@helix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@helix.apache.org
For additional commands, e-mail: reviews-help@helix.apache.org
Re: [PR] Move existing assignments usage calculation to pre-process stage [helix]
Posted by "frankmu (via GitHub)" <gi...@apache.org>.
frankmu commented on code in PR #2888:
URL: https://github.com/apache/helix/pull/2888#discussion_r1735545579
##########
helix-core/src/main/java/org/apache/helix/controller/dataproviders/ResourceControllerDataProvider.java:
##########
@@ -583,6 +587,38 @@ public Set<CapacityNode> getSimpleCapacitySet() {
return _simpleCapacitySet;
}
+ public void populateSimpleCapacitySetUsage(final Set<String> resourceNameSet,
+ final CurrentStateOutput currentStateOutput) {
+ Map<String, LiveInstance> instanceMap = getLiveInstances();
+ // Convert the assignableNodes to map for quick lookup
+ Map<String, CapacityNode> simpleCapacityMap =
+ _simpleCapacitySet.stream().collect(Collectors.toMap(CapacityNode::getId, node -> node));
Review Comment:
> Also, will this update the _simpleCapacitySet when you update the map? It is tmp object, right?
It's tmp object acts as dictionary to quickly lookup the `CapacityNode` by name in the set, it won't update `_simpleCapacitySet`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@helix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@helix.apache.org
For additional commands, e-mail: reviews-help@helix.apache.org
Re: [PR] Move existing assignments usage calculation to pre-process stage [helix]
Posted by "junkaixue (via GitHub)" <gi...@apache.org>.
junkaixue merged PR #2888:
URL: https://github.com/apache/helix/pull/2888
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@helix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@helix.apache.org
For additional commands, e-mail: reviews-help@helix.apache.org
Re: [PR] Move existing assignments usage calculation to pre-process stage [helix]
Posted by "frankmu (via GitHub)" <gi...@apache.org>.
frankmu commented on PR #2888:
URL: https://github.com/apache/helix/pull/2888#issuecomment-2319351118
This PR is ready to be merged. Approved by @junkaixue
Commit message: [Move existing assignments usage calculation to pre-process stage]
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@helix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@helix.apache.org
For additional commands, e-mail: reviews-help@helix.apache.org
Re: [PR] Move existing assignments usage calculation to pre-process stage [helix]
Posted by "junkaixue (via GitHub)" <gi...@apache.org>.
junkaixue commented on code in PR #2888:
URL: https://github.com/apache/helix/pull/2888#discussion_r1729521273
##########
helix-core/src/main/java/org/apache/helix/controller/dataproviders/ResourceControllerDataProvider.java:
##########
@@ -583,6 +587,38 @@ public Set<CapacityNode> getSimpleCapacitySet() {
return _simpleCapacitySet;
}
+ public void populateSimpleCapacitySetUsage(final Set<String> resourceNameSet,
+ final CurrentStateOutput currentStateOutput) {
+ Map<String, LiveInstance> instanceMap = getLiveInstances();
+ // Convert the assignableNodes to map for quick lookup
+ Map<String, CapacityNode> simpleCapacityMap =
+ _simpleCapacitySet.stream().collect(Collectors.toMap(CapacityNode::getId, node -> node));
Review Comment:
Try to avoid lambda but use for loop. Lambda function is slower and creates a lot of tmp objects, which Helix already experienced before.
Also, will this update the _simpleCapacitySet when you update the map? It is tmp object, right?
##########
helix-core/src/main/java/org/apache/helix/controller/dataproviders/ResourceControllerDataProvider.java:
##########
@@ -583,6 +587,38 @@ public Set<CapacityNode> getSimpleCapacitySet() {
return _simpleCapacitySet;
}
+ public void populateSimpleCapacitySetUsage(final Set<String> resourceNameSet,
+ final CurrentStateOutput currentStateOutput) {
+ Map<String, LiveInstance> instanceMap = getLiveInstances();
+ // Convert the assignableNodes to map for quick lookup
+ Map<String, CapacityNode> simpleCapacityMap =
+ _simpleCapacitySet.stream().collect(Collectors.toMap(CapacityNode::getId, node -> node));
+ for (String resourceName : resourceNameSet) {
+ // Process current state mapping
+ for (Map.Entry<Partition, Map<String, String>> entry : currentStateOutput.getCurrentStateMap(
+ resourceName).entrySet()) {
+ String partition = entry.getKey().getPartitionName();
Review Comment:
No need to create this reference if it was just used once in following code.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@helix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@helix.apache.org
For additional commands, e-mail: reviews-help@helix.apache.org