YARN-10647. Fix TestRMNodeLabelsManager failed after YARN-10501. Cont…

…ributed by Qi Zhu.
kiran-maturi · Nov 24, 2021 · 24be512 · 24be512
1 parent 0145be6
commit 24be512
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/...-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java b/...-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java
@@ -646,7 +646,9 @@ protected void internalUpdateLabelsOnNodes(
           host.labels.addAll(labels);
           for (Node node : host.nms.values()) {
             replaceNodeForLabels(node.nodeId, node.labels, labels);
-            replaceLabelsForNode(node.nodeId, node.labels, labels);
+            if (node.labels != null && labels != null) {
+              replaceLabelsForNode(node.nodeId, node.labels, labels);
+            }
             node.labels = null;
           }
           break;