Repository: hadoop Updated Branches: refs/heads/branch-2 472541291 -> f626d18cc
YARN-4431. Not necessary to do unRegisterNM() if NM get stop due to failed to connect to RM. (Junpin Du via rohithsharmaks) (cherry picked from commit 15c3e7ffe3d1c57ad36afd993f09fc47889c93bd) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f626d18c Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f626d18c Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f626d18c Branch: refs/heads/branch-2 Commit: f626d18cc37403057eb4fb5a49a6845aa2b07b8a Parents: 4725412 Author: rohithsharmaks <[email protected]> Authored: Wed Dec 9 10:50:43 2015 +0530 Committer: rohithsharmaks <[email protected]> Committed: Wed Dec 9 10:51:57 2015 +0530 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../hadoop/yarn/server/nodemanager/NodeStatusUpdaterImpl.java | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/f626d18c/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index f2d48ab..5d0d2a1 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -1056,6 +1056,9 @@ Release 2.8.0 - UNRELEASED YARN-4392. ApplicationCreatedEvent event time resets after RM restart/failover. (Naganarasimha G R and Xuan Gong via xgong) + YARN-4431. Not necessary to do unRegisterNM() if NM get stop due to failed to connect + to RM. (Junping Du via rohithsharmaks) + Release 2.7.3 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/f626d18c/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 34267b3..ba915c2 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 @@ -134,6 +134,7 @@ public class NodeStatusUpdaterImpl extends AbstractService implements private Runnable statusUpdaterRunnable; private Thread statusUpdater; + private boolean failedToConnect = false; private long rmIdentifier = ResourceManagerConstants.RM_INVALID_IDENTIFIER; private boolean registeredWithRM = false; Set<ContainerId> pendingContainersToRemove = new HashSet<ContainerId>(); @@ -241,7 +242,7 @@ public class NodeStatusUpdaterImpl extends AbstractService implements // the isStopped check is for avoiding multiple unregistrations. if (this.registeredWithRM && !this.isStopped && !isNMUnderSupervisionWithRecoveryEnabled() - && !context.getDecommissioned()) { + && !context.getDecommissioned() && !failedToConnect) { unRegisterNM(); } // Interrupt the updater. @@ -823,6 +824,8 @@ public class NodeStatusUpdaterImpl extends AbstractService implements //catch and throw the exception if tried MAX wait time to connect RM dispatcher.getEventHandler().handle( new NodeManagerEvent(NodeManagerEventType.SHUTDOWN)); + // failed to connect to RM. + failedToConnect = true; throw new YarnRuntimeException(e); } catch (Throwable e) {
