You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by eb...@apache.org on 2021/02/22 18:48:48 UTC
[hadoop] branch trunk updated: YARN-10647. Fix
TestRMNodeLabelsManager failed after YARN-10501. Contributed by Qi Zhu.
This is an automated email from the ASF dual-hosted git repository.
ebadger pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 47420ae YARN-10647. Fix TestRMNodeLabelsManager failed after YARN-10501. Contributed by Qi Zhu.
47420ae is described below
commit 47420ae3edb9076d3aac7775de8712a7685dc135
Author: Eric Badger <eb...@verizonmedia.com>
AuthorDate: Mon Feb 22 18:48:14 2021 +0000
YARN-10647. Fix TestRMNodeLabelsManager failed after YARN-10501. Contributed by
Qi Zhu.
---
.../org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java
index 8fd0315..5b9382fc 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java
@@ -646,7 +646,9 @@ public class CommonNodeLabelsManager extends AbstractService {
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;
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org