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

Qi Zhu.
This commit is contained in:
Eric Badger 2021-02-22 18:48:14 +00:00
parent 8bca105655
commit 47420ae3ed
1 changed files with 3 additions and 1 deletions

View File

@ -646,7 +646,9 @@ public class CommonNodeLabelsManager extends AbstractService {
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;