Add handling for clusterConfig == null in updateSwappingInstances and…

… fix AssignableNode to check for clusterTopologyConfig when attempting to get logicalId.
apache · Oct 27, 2023 · d3887bd · d3887bd
1 parent a6557cf
commit d3887bd
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/...e/src/main/java/org/apache/helix/controller/dataproviders/BaseControllerDataProvider.java b/...e/src/main/java/org/apache/helix/controller/dataproviders/BaseControllerDataProvider.java
@@ -888,10 +888,17 @@ private void updateDisabledInstances(Collection<InstanceConfig> instanceConfigs,
 
   private void updateSwappingInstances(Collection<InstanceConfig> instanceConfigs,
       Set<String> liveEnabledInstances, ClusterConfig clusterConfig) {
-    ClusterTopologyConfig clusterTopologyConfig =
-        ClusterTopologyConfig.createFromClusterConfig(clusterConfig);
     _swapOutInstanceNameToSwapInInstanceName.clear();
     _enabledLiveSwapInInstanceNames.clear();
+
+    if (clusterConfig == null) {
+      logger.warn("Skip refreshing swapping instances because clusterConfig is null.");
+      return;
+    }
+
+    ClusterTopologyConfig clusterTopologyConfig =
+        ClusterTopologyConfig.createFromClusterConfig(clusterConfig);
+
     Map<String, String> swapOutLogicalIdsByInstanceName = new HashMap<>();
     Map<String, String> swapInInstancesByLogicalId = new HashMap<>();
     instanceConfigs.forEach(instanceConfig -> {

diff --git a/...core/src/main/java/org/apache/helix/controller/rebalancer/waged/model/AssignableNode.java b/...core/src/main/java/org/apache/helix/controller/rebalancer/waged/model/AssignableNode.java
@@ -78,7 +78,7 @@ public class AssignableNode implements Comparable<AssignableNode> {
       InstanceConfig instanceConfig, String instanceName) {
     _instanceName = instanceName;
     _logicaId =
-        clusterConfig != null ? instanceConfig.getLogicalId(clusterTopologyConfig.getEndNodeType())
+        clusterTopologyConfig != null ? instanceConfig.getLogicalId(clusterTopologyConfig.getEndNodeType())
             : instanceName;
     Map<String, Integer> instanceCapacity = fetchInstanceCapacity(clusterConfig, instanceConfig);
     _faultZone = computeFaultZone(clusterConfig, instanceConfig);

diff --git a/...-core/src/test/java/org/apache/helix/controller/rebalancer/waged/TestWagedRebalancer.java b/...-core/src/test/java/org/apache/helix/controller/rebalancer/waged/TestWagedRebalancer.java
@@ -738,7 +738,7 @@ public void testRebalanceOverwrite() throws HelixRebalanceException, IOException
     instances.add(offlineInstance);
     when(clusterData.getAllInstances()).thenReturn(instances);
     when(clusterData.getEnabledInstances()).thenReturn(instances);
-    when(clusterData.getEnabledLiveInstances()).thenReturn(ImmutableSet.of(instance0, instance1, instance2));
+    when(clusterData.getEnabledLiveInstances()).thenReturn(new HashSet<>(Set.of(instance0, instance1, instance2)));
     Map<String, Long> instanceOfflineTimeMap = new HashMap<>();
     instanceOfflineTimeMap.put(offlineInstance, System.currentTimeMillis() + Integer.MAX_VALUE);
     when(clusterData.getInstanceOfflineTimeMap()).thenReturn(instanceOfflineTimeMap);