add npr guard

apache · Oct 18, 2023 · 839ca71 · 839ca71
1 parent 38ac277
commit 839ca71
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/...-core/src/main/java/org/apache/helix/controller/rebalancer/util/DelayedRebalanceUtil.java b/...-core/src/main/java/org/apache/helix/controller/rebalancer/util/DelayedRebalanceUtil.java
@@ -132,9 +132,10 @@ private static Set<String> getActiveNodes(Set<String> allNodes, Set<String> live
 
   public static Set<String> filterOutEvacuatingInstances(Map<String, InstanceConfig> instanceConfigMap,
       Set<String> nodes) {
-    return  nodes.stream()
-        .filter(instance -> !instanceConfigMap.get(instance).getInstanceOperation().equals(
-            InstanceConstants.InstanceOperation.EVACUATE.name()))
+    return nodes.stream()
+        .filter(instance -> (instanceConfigMap.get(instance) != null && !instanceConfigMap.get(instance)
+            .getInstanceOperation()
+            .equals(InstanceConstants.InstanceOperation.EVACUATE.name())))
         .collect(Collectors.toSet());
   }