big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

YARN-10647. Fix TestRMNodeLabelsManager failed after YARN-10501. Contributed by

Browse Source 
Qi Zhu.

(cherry picked from commit 47420ae3ed)
This commit is contained in:
Eric Badger 2021-02-22 18:59:45 +00:00
parent 3339ff5966
commit 305c4e72c2
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java
View File

@ -646,7 +646,9 @@ protected void internalUpdateLabelsOnNodes(
host.labels.addAll(labels); host.labels.addAll(labels);
for (Node node : host.nms.values()) { for (Node node : host.nms.values()) {
replaceNodeForLabels(node.nodeId, node.labels, labels); 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; node.labels = null;
} }
break; break;