You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@helix.apache.org by GitBox <gi...@apache.org> on 2020/06/05 00:44:22 UTC
[GitHub] [helix] jiajunwang opened a new pull request #1065: Trim non cluster topology related changes in the WAGED rebalancer calculation.
jiajunwang opened a new pull request #1065:
URL: https://github.com/apache/helix/pull/1065
### Issues
- [X] My PR addresses the following Helix issues and references them in the PR description:
#1063
### Description
- [X] Here are some details about my PR, including screenshots of any UI changes:
Cluster topology fields are considered as the fundamental attributes of the cluster. For example, instance capacity, resource partition count, partition weight, etc.
If the topology related fields are updated, the WAGED rebalancer will trigger the global rebalance process. Otherwise, the rebalancer will only do local (limited) rebalance to avoid unexpected partition movements.
This change introduces HelixProperty Trimmer to filter out the non-topology related fields so the changes in those fields won't trigger the global rebalancing.
### Tests
- [X] The following tests are written for this issue:
TestHelixPropoertyTimmer
- [ ] The following is the result of the "mvn test" command on the appropriate module:
[INFO]
[INFO] Results:
[INFO]
[ERROR] Failures:
[ERROR] TestPartitionMovementThrottle.testResourceThrottle:161->getMaxParallelTransitionCount:375 ยป ConcurrentModification
[ERROR] TestWorkflowTermination.testWorkflowRunningTimeout:131->verifyWorkflowCleanup:257 expected:<true> but was:<false>
[ERROR] TestWorkflowTimeout.testWorkflowTimeoutWhenWorkflowCompleted:116 expected:<true> but was:<false>
[INFO]
[ERROR] Tests run: 1150, Failures: 3, Errors: 0, Skipped: 1
Rerun,
[INFO] Tests run: 14, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 95.276 s - in TestSuite
[INFO]
[INFO] Results:
[INFO]
[INFO] Tests run: 14, Failures: 0, Errors: 0, Skipped: 0
[INFO]
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 01:41 min
[INFO] Finished at: 2020-06-04T11:01:27-07:00
[INFO] ------------------------------------------------------------------------
### Commits
- [X] 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"
### Documentation (Optional)
- [ ] In case of new functionality, my PR adds documentation in the following wiki page:
(Link the GitHub wiki you added)
### Code Quality
- [X] 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.
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
[GitHub] [helix] jiajunwang merged pull request #1065: Trim non cluster topology related changes in the WAGED rebalancer calculation.
Posted by GitBox <gi...@apache.org>.
jiajunwang merged pull request #1065:
URL: https://github.com/apache/helix/pull/1065
----------------------------------------------------------------
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.
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
[GitHub] [helix] jiajunwang commented on a change in pull request #1065: Trim non cluster topology related changes in the WAGED rebalancer calculation.
Posted by GitBox <gi...@apache.org>.
jiajunwang commented on a change in pull request #1065:
URL: https://github.com/apache/helix/pull/1065#discussion_r437646008
##########
File path: helix-core/src/main/java/org/apache/helix/controller/changedetector/trimmer/ResourceConfigTrimmer.java
##########
@@ -0,0 +1,81 @@
+package org.apache.helix.controller.changedetector.trimmer;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import org.apache.helix.model.ResourceConfig;
+import org.apache.helix.model.ResourceConfig.ResourceConfigProperty;
+
+/**
+ * A singleton HelixProperty Trimmer for ResourceConfig to remove the non-cluster-topology-related
+ * fields.
+ */
+public class ResourceConfigTrimmer extends HelixPropertyTrimmer<ResourceConfig> {
+ private static final ResourceConfigTrimmer _resourceConfigTrimmer = new ResourceConfigTrimmer();
+
+ /**
+ * The following fields are considered as non-topology related.
+ * MONITORING_DISABLED,
+ * GROUP_ROUTING_ENABLED,
+ * EXTERNAL_VIEW_DISABLED,
+ * DELAY_REBALANCE_ENABLED,
+ * HELIX_ENABLED
+ */
+ private static final Map<FieldType, Set<String>> STATIC_NON_TRIMMABLE_FIELD_MAP = ImmutableMap
+ .of(FieldType.SIMPLE_FIELD, ImmutableSet
+ .of(ResourceConfigProperty.NUM_PARTITIONS.name(),
+ ResourceConfigProperty.STATE_MODEL_DEF_REF.name(),
+ ResourceConfigProperty.STATE_MODEL_FACTORY_NAME.name(),
+ ResourceConfigProperty.MIN_ACTIVE_REPLICAS.name(),
+ ResourceConfigProperty.REPLICAS.name(),
+ ResourceConfigProperty.MAX_PARTITIONS_PER_INSTANCE.name(),
+ ResourceConfigProperty.INSTANCE_GROUP_TAG.name(),
+ ResourceConfigProperty.RESOURCE_GROUP_NAME.name(),
+ ResourceConfigProperty.RESOURCE_TYPE.name()),
+ FieldType.MAP_FIELD, ImmutableSet
+ .of(ResourceConfigProperty.PARTITION_CAPACITY_MAP.name()));
+
+ private ResourceConfigTrimmer() {
+ }
+
+ @Override
+ protected Map<FieldType, Set<String>> getNonTrimmableFields(ResourceConfig resourceConfig) {
+ Map<FieldType, Set<String>> nonTrimmableFields = new HashMap<>(STATIC_NON_TRIMMABLE_FIELD_MAP);
+ // Also don't trim the application defined preference list in the list fields.
+ // They are fixed and considered as part of the cluster topology.
+ nonTrimmableFields
+ .put(FieldType.LIST_FIELD, resourceConfig.getRecord().getListFields().keySet());
Review comment:
Discussed with Junkai offline. The other map fields are for the jobs only. We don't have that usage in the scope of WAGED rebalance for now. And they are not strictly considered as the topology change.
##########
File path: helix-core/src/main/java/org/apache/helix/controller/changedetector/trimmer/ResourceConfigTrimmer.java
##########
@@ -0,0 +1,81 @@
+package org.apache.helix.controller.changedetector.trimmer;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import org.apache.helix.model.ResourceConfig;
+import org.apache.helix.model.ResourceConfig.ResourceConfigProperty;
+
+/**
+ * A singleton HelixProperty Trimmer for ResourceConfig to remove the non-cluster-topology-related
+ * fields.
+ */
+public class ResourceConfigTrimmer extends HelixPropertyTrimmer<ResourceConfig> {
+ private static final ResourceConfigTrimmer _resourceConfigTrimmer = new ResourceConfigTrimmer();
+
+ /**
+ * The following fields are considered as non-topology related.
+ * MONITORING_DISABLED,
+ * GROUP_ROUTING_ENABLED,
+ * EXTERNAL_VIEW_DISABLED,
+ * DELAY_REBALANCE_ENABLED,
+ * HELIX_ENABLED
+ */
+ private static final Map<FieldType, Set<String>> STATIC_NON_TRIMMABLE_FIELD_MAP = ImmutableMap
+ .of(FieldType.SIMPLE_FIELD, ImmutableSet
+ .of(ResourceConfigProperty.NUM_PARTITIONS.name(),
+ ResourceConfigProperty.STATE_MODEL_DEF_REF.name(),
+ ResourceConfigProperty.STATE_MODEL_FACTORY_NAME.name(),
+ ResourceConfigProperty.MIN_ACTIVE_REPLICAS.name(),
+ ResourceConfigProperty.REPLICAS.name(),
+ ResourceConfigProperty.MAX_PARTITIONS_PER_INSTANCE.name(),
+ ResourceConfigProperty.INSTANCE_GROUP_TAG.name(),
+ ResourceConfigProperty.RESOURCE_GROUP_NAME.name(),
+ ResourceConfigProperty.RESOURCE_TYPE.name()),
+ FieldType.MAP_FIELD, ImmutableSet
+ .of(ResourceConfigProperty.PARTITION_CAPACITY_MAP.name()));
+
+ private ResourceConfigTrimmer() {
+ }
+
+ @Override
+ protected Map<FieldType, Set<String>> getNonTrimmableFields(ResourceConfig resourceConfig) {
+ Map<FieldType, Set<String>> nonTrimmableFields = new HashMap<>(STATIC_NON_TRIMMABLE_FIELD_MAP);
+ // Also don't trim the application defined preference list in the list fields.
+ // They are fixed and considered as part of the cluster topology.
+ nonTrimmableFields
+ .put(FieldType.LIST_FIELD, resourceConfig.getRecord().getListFields().keySet());
Review comment:
Discussed with Junkai offline. The other map fields are for the jobs only. We don't have that usage in the scope of WAGED rebalance for now. And they are not strictly considered as the topology related.
----------------------------------------------------------------
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.
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
[GitHub] [helix] jiajunwang commented on a change in pull request #1065: Trim non cluster topology related changes in the WAGED rebalancer calculation.
Posted by GitBox <gi...@apache.org>.
jiajunwang commented on a change in pull request #1065:
URL: https://github.com/apache/helix/pull/1065#discussion_r437637052
##########
File path: helix-core/src/main/java/org/apache/helix/controller/changedetector/trimmer/ClusterConfigTrimmer.java
##########
@@ -0,0 +1,92 @@
+package org.apache.helix.controller.changedetector.trimmer;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.util.Map;
+import java.util.Set;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import org.apache.helix.model.ClusterConfig;
+import org.apache.helix.model.ClusterConfig.ClusterConfigProperty;
+
+/**
+ * A singleton HelixProperty Trimmer for ClusterConfig to remove the non-cluster-topology-related
+ * fields.
+ */
+public class ClusterConfigTrimmer extends HelixPropertyTrimmer<ClusterConfig> {
+ private static final ClusterConfigTrimmer _clusterConfigTrimmer = new ClusterConfigTrimmer();
+
+ /**
+ * The following fields are considered as non-topology related.
+ * HELIX_DISABLE_PIPELINE_TRIGGERS,
+ * PERSIST_BEST_POSSIBLE_ASSIGNMENT,
+ * PERSIST_INTERMEDIATE_ASSIGNMENT,
+ * STATE_TRANSITION_THROTTLE_CONFIGS,
+ * STATE_TRANSITION_CANCELLATION_ENABLED,
+ * MISS_TOP_STATE_DURATION_THRESHOLD,
+ * RESOURCE_PRIORITY_FIELD,
+ * REBALANCE_TIMER_P\ERIOD,
Review comment:
Good catch!
----------------------------------------------------------------
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.
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
[GitHub] [helix] dasahcc commented on a change in pull request #1065: Trim non cluster topology related changes in the WAGED rebalancer calculation.
Posted by GitBox <gi...@apache.org>.
dasahcc commented on a change in pull request #1065:
URL: https://github.com/apache/helix/pull/1065#discussion_r437629220
##########
File path: helix-core/src/main/java/org/apache/helix/controller/changedetector/trimmer/ClusterConfigTrimmer.java
##########
@@ -0,0 +1,92 @@
+package org.apache.helix.controller.changedetector.trimmer;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.util.Map;
+import java.util.Set;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import org.apache.helix.model.ClusterConfig;
+import org.apache.helix.model.ClusterConfig.ClusterConfigProperty;
+
+/**
+ * A singleton HelixProperty Trimmer for ClusterConfig to remove the non-cluster-topology-related
+ * fields.
+ */
+public class ClusterConfigTrimmer extends HelixPropertyTrimmer<ClusterConfig> {
+ private static final ClusterConfigTrimmer _clusterConfigTrimmer = new ClusterConfigTrimmer();
+
+ /**
+ * The following fields are considered as non-topology related.
+ * HELIX_DISABLE_PIPELINE_TRIGGERS,
+ * PERSIST_BEST_POSSIBLE_ASSIGNMENT,
+ * PERSIST_INTERMEDIATE_ASSIGNMENT,
+ * STATE_TRANSITION_THROTTLE_CONFIGS,
+ * STATE_TRANSITION_CANCELLATION_ENABLED,
+ * MISS_TOP_STATE_DURATION_THRESHOLD,
+ * RESOURCE_PRIORITY_FIELD,
+ * REBALANCE_TIMER_P\ERIOD,
Review comment:
REBALANCE_TIMER_PERIOD
##########
File path: helix-core/src/main/java/org/apache/helix/controller/changedetector/trimmer/ResourceConfigTrimmer.java
##########
@@ -0,0 +1,81 @@
+package org.apache.helix.controller.changedetector.trimmer;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import org.apache.helix.model.ResourceConfig;
+import org.apache.helix.model.ResourceConfig.ResourceConfigProperty;
+
+/**
+ * A singleton HelixProperty Trimmer for ResourceConfig to remove the non-cluster-topology-related
+ * fields.
+ */
+public class ResourceConfigTrimmer extends HelixPropertyTrimmer<ResourceConfig> {
+ private static final ResourceConfigTrimmer _resourceConfigTrimmer = new ResourceConfigTrimmer();
+
+ /**
+ * The following fields are considered as non-topology related.
+ * MONITORING_DISABLED,
+ * GROUP_ROUTING_ENABLED,
+ * EXTERNAL_VIEW_DISABLED,
+ * DELAY_REBALANCE_ENABLED,
+ * HELIX_ENABLED
+ */
+ private static final Map<FieldType, Set<String>> STATIC_NON_TRIMMABLE_FIELD_MAP = ImmutableMap
+ .of(FieldType.SIMPLE_FIELD, ImmutableSet
+ .of(ResourceConfigProperty.NUM_PARTITIONS.name(),
+ ResourceConfigProperty.STATE_MODEL_DEF_REF.name(),
+ ResourceConfigProperty.STATE_MODEL_FACTORY_NAME.name(),
+ ResourceConfigProperty.MIN_ACTIVE_REPLICAS.name(),
+ ResourceConfigProperty.REPLICAS.name(),
+ ResourceConfigProperty.MAX_PARTITIONS_PER_INSTANCE.name(),
+ ResourceConfigProperty.INSTANCE_GROUP_TAG.name(),
+ ResourceConfigProperty.RESOURCE_GROUP_NAME.name(),
+ ResourceConfigProperty.RESOURCE_TYPE.name()),
+ FieldType.MAP_FIELD, ImmutableSet
+ .of(ResourceConfigProperty.PARTITION_CAPACITY_MAP.name()));
+
+ private ResourceConfigTrimmer() {
+ }
+
+ @Override
+ protected Map<FieldType, Set<String>> getNonTrimmableFields(ResourceConfig resourceConfig) {
+ Map<FieldType, Set<String>> nonTrimmableFields = new HashMap<>(STATIC_NON_TRIMMABLE_FIELD_MAP);
+ // Also don't trim the application defined preference list in the list fields.
+ // They are fixed and considered as part of the cluster topology.
+ nonTrimmableFields
+ .put(FieldType.LIST_FIELD, resourceConfig.getRecord().getListFields().keySet());
Review comment:
MapField is not trimmable whatever for user defined the mapping or TaskConfigs.
----------------------------------------------------------------
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.
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
[GitHub] [helix] jiajunwang commented on pull request #1065: Trim non cluster topology related changes in the WAGED rebalancer calculation.
Posted by GitBox <gi...@apache.org>.
jiajunwang commented on pull request #1065:
URL: https://github.com/apache/helix/pull/1065#issuecomment-641577556
This PR is ready to be merged, approved by @dasahcc
----------------------------------------------------------------
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.
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