xyuanlu commented on a change in pull request #1043:
URL: https://github.com/apache/helix/pull/1043#discussion_r438510939



##########
File path: 
helix-core/src/main/java/org/apache/helix/controller/rebalancer/topology/Topology.java
##########
@@ -212,123 +187,129 @@ private static Node cloneTree(Node root, Map<Node, 
Integer> newNodeWeight, Set<N
     return newRoot;
   }
 
-  /**
-   * Creates a tree representing the cluster structure using default cluster 
topology definition
-   * (i,e no topology definition given and no domain id set).
-   */
-  private Node createClusterTreeWithDefaultTopologyDef() {
+  private Node createClusterTree() {
     // root
     Node root = new Node();
     root.setName("root");
     root.setId(computeId("root"));
     root.setType(Types.ROOT.name());
 
-    for (String ins : _allInstances) {
-      InstanceConfig config = _instanceConfigMap.get(ins);
-      Map<String, String> pathValueMap = new HashMap<>();
-      if (_topologyAwareEnabled) {
-        String zone = config.getZoneId();
-        if (zone == null) {
-          // we have the hierarchy style of domain id for instance.
-          if (config.getInstanceEnabled() && 
(_clusterConfig.getDisabledInstances() == null
-              || !_clusterConfig.getDisabledInstances().containsKey(ins))) {
-            // if enabled instance missing ZONE_ID information, fails the 
rebalance.
-            throw new HelixException(String
-                .format("ZONE_ID for instance %s is not set, failed the 
topology-aware placement!",
-                    ins));
-          } else {
-            // if the disabled instance missing ZONE setting, ignore it should 
be fine.
-            logger.warn(String
-                .format("ZONE_ID for instance %s is not set, failed the 
topology-aware placement!",
-                    ins));
-            continue;
-          }
-
+    for (String instance : _allInstances) {
+      InstanceConfig insConfig = _instanceConfigMap.get(instance);
+      Map<String, String> instanceTopologyMap =

Review comment:
       Shouldn't we use interface for declaration (as previous comments 
suggested)? 
   Or in this specific case it's better to explicitly state the ordering is 
important?




----------------------------------------------------------------
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:
[email protected]



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to