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/26 19:35:56 UTC
[hadoop] branch branch-3.2 updated: YARN-10653. Fixed the findbugs
issues introduced by YARN-10647. Contributed by Qi Zhu
This is an automated email from the ASF dual-hosted git repository.
ebadger pushed a commit to branch branch-3.2
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.2 by this push:
new 49375c0 YARN-10653. Fixed the findbugs issues introduced by YARN-10647. Contributed by Qi Zhu
49375c0 is described below
commit 49375c0b536cd8b84d100a50a7f8cd1c3951bfd2
Author: Eric Badger <eb...@verizonmedia.com>
AuthorDate: Fri Feb 26 19:17:24 2021 +0000
YARN-10653. Fixed the findbugs issues introduced by YARN-10647. Contributed by
Qi Zhu
(cherry picked from commit fcdb1e7fec45ded55e8b7fdc29f8caf85547cca3)
---
.../java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java | 2 +-
1 file changed, 1 insertion(+), 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 b43e933..17a5a4b 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
@@ -645,7 +645,7 @@ public class CommonNodeLabelsManager extends AbstractService {
host.labels.addAll(labels);
for (Node node : host.nms.values()) {
replaceNodeForLabels(node.nodeId, node.labels, labels);
- if (node.labels != null && labels != null) {
+ if (node.labels != null) {
replaceLabelsForNode(node.nodeId, node.labels, labels);
}
node.labels = null;
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org