Repository: hadoop
Updated Branches:
  refs/heads/trunk 947b28298 -> e6b74164e


YARN-8043.  Added the exception message for failed launches running under LCE.
            Contributed by Shane Kumpf


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e6b74164
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e6b74164
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e6b74164

Branch: refs/heads/trunk
Commit: e6b74164e9fc50518e03629c99525c2136c01593
Parents: 947b282
Author: Eric Yang <[email protected]>
Authored: Mon Mar 26 13:21:35 2018 -0400
Committer: Eric Yang <[email protected]>
Committed: Mon Mar 26 13:21:35 2018 -0400

----------------------------------------------------------------------
 .../hadoop/yarn/server/nodemanager/LinuxContainerExecutor.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/e6b74164/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/LinuxContainerExecutor.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/LinuxContainerExecutor.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/LinuxContainerExecutor.java
index e92c4e2..f0b0714 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/LinuxContainerExecutor.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/LinuxContainerExecutor.java
@@ -563,12 +563,13 @@ public class LinuxContainerExecutor extends 
ContainerExecutor {
         builder.append("Exception from container-launch.\n");
         builder.append("Container id: " + containerId + "\n");
         builder.append("Exit code: " + exitCode + "\n");
+        builder.append("Exception message: " + e.getMessage() + "\n");
         if (!Optional.fromNullable(e.getErrorOutput()).or("").isEmpty()) {
-          builder.append("Exception message: " + e.getErrorOutput() + "\n");
+          builder.append("Shell error output: " + e.getErrorOutput() + "\n");
         }
         //Skip stack trace
         String output = e.getOutput();
-        if (output != null && !e.getOutput().isEmpty()) {
+        if (output != null && !output.isEmpty()) {
           builder.append("Shell output: " + output + "\n");
         }
         String diagnostics = builder.toString();


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to