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 as...@apache.org on 2017/04/17 15:15:36 UTC
[11/50] hadoop git commit: YARN-6368. Decommissioning an NM results
in a -1 exit code (miklos.szegedi@cloudera.com via rkanter)
YARN-6368. Decommissioning an NM results in a -1 exit code (miklos.szegedi@cloudera.com via rkanter)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/63f73225
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/63f73225
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/63f73225
Branch: refs/heads/trunk
Commit: 63f7322522e0ab223ceb91440636eb62ca0a3e41
Parents: d298f73
Author: Robert Kanter <rk...@apache.org>
Authored: Fri Apr 7 14:28:07 2017 -0700
Committer: Robert Kanter <rk...@apache.org>
Committed: Fri Apr 7 14:28:07 2017 -0700
----------------------------------------------------------------------
.../yarn/server/nodemanager/NodeManager.java | 26 +++++++++++++++++---
.../nodemanager/TestNodeManagerResync.java | 2 +-
2 files changed, 23 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/63f73225/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeManager.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/NodeManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeManager.java
index 60bd00b..1cff53f 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeManager.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeManager.java
@@ -83,6 +83,24 @@ public class NodeManager extends CompositeService
implements EventHandler<NodeManagerEvent> {
/**
+ * Node manager return status codes.
+ */
+ public enum NodeManagerStatus {
+ NO_ERROR(0),
+ EXCEPTION(1);
+
+ private int exitCode;
+
+ NodeManagerStatus(int exitCode) {
+ this.exitCode = exitCode;
+ }
+
+ public int getExitCode() {
+ return exitCode;
+ }
+ }
+
+ /**
* Priority of the NodeManager shutdown hook.
*/
public static final int SHUTDOWN_HOOK_PRIORITY = 30;
@@ -421,7 +439,7 @@ public class NodeManager extends CompositeService
return "NodeManager";
}
- protected void shutDown() {
+ protected void shutDown(final int exitCode) {
new Thread() {
@Override
public void run() {
@@ -432,7 +450,7 @@ public class NodeManager extends CompositeService
} finally {
if (shouldExitOnShutdownEvent
&& !ShutdownHookManager.get().isShutdownInProgress()) {
- ExitUtil.terminate(-1);
+ ExitUtil.terminate(exitCode);
}
}
}
@@ -457,7 +475,7 @@ public class NodeManager extends CompositeService
.rebootNodeStatusUpdaterAndRegisterWithRM();
} catch (YarnRuntimeException e) {
LOG.fatal("Error while rebooting NodeStatusUpdater.", e);
- shutDown();
+ shutDown(NodeManagerStatus.EXCEPTION.getExitCode());
}
}
}.start();
@@ -744,7 +762,7 @@ public class NodeManager extends CompositeService
public void handle(NodeManagerEvent event) {
switch (event.getType()) {
case SHUTDOWN:
- shutDown();
+ shutDown(NodeManagerStatus.NO_ERROR.getExitCode());
break;
case RESYNC:
resyncWithRM();
http://git-wip-us.apache.org/repos/asf/hadoop/blob/63f73225/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerResync.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerResync.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerResync.java
index 04cfae9..5ab5c37 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerResync.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerResync.java
@@ -638,7 +638,7 @@ public class TestNodeManagerResync {
}
@Override
- protected void shutDown() {
+ protected void shutDown(int exitCode) {
synchronized (isNMShutdownCalled) {
isNMShutdownCalled.set(true);
isNMShutdownCalled.notify();
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org