Repository: hadoop Updated Branches: refs/heads/branch-2.8 efa7dc938 -> 56c779942
YARN-7647. NM print inappropriate error log when node-labels is enabled. Contributed by Yang Wang. (cherry picked from commit 7efc4f76885348730728c0201dd0d1a89b213e9c) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/56c77994 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/56c77994 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/56c77994 Branch: refs/heads/branch-2.8 Commit: 56c779942b03a15ea8a1ad6a74393a87e5b6e35f Parents: efa7dc9 Author: Weiwei Yang <[email protected]> Authored: Wed Dec 13 13:11:41 2017 +0800 Committer: Weiwei Yang <[email protected]> Committed: Wed Dec 13 13:22:59 2017 +0800 ---------------------------------------------------------------------- .../yarn/server/nodemanager/NodeStatusUpdaterImpl.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/56c77994/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeStatusUpdaterImpl.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeStatusUpdaterImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeStatusUpdaterImpl.java index 98b267a..2edc6fd 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeStatusUpdaterImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeStatusUpdaterImpl.java @@ -1107,9 +1107,12 @@ public class NodeStatusUpdaterImpl extends AbstractService implements public void verifyRMHeartbeatResponseForNodeLabels( NodeHeartbeatResponse response) { if (areLabelsSentToRM) { - if (response.getAreNodeLabelsAcceptedByRM() && LOG.isDebugEnabled()) { - LOG.debug("Node Labels {" + StringUtils.join(",", previousNodeLabels) - + "} were Accepted by RM "); + if (response.getAreNodeLabelsAcceptedByRM()) { + if(LOG.isDebugEnabled()){ + LOG.debug( + "Node Labels {" + StringUtils.join(",", previousNodeLabels) + + "} were Accepted by RM "); + } } else { // case where updated labels from NodeLabelsProvider is sent to RM and // RM rejected the labels --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
