hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bil...@apache.org
Subject hadoop git commit: YARN-8043. Added the exception message for failed launches running under LCE. Contributed by Shane Kumpf
Date Thu, 26 Apr 2018 15:49:51 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-3.1 099e9fb22 -> 050bd4cd2


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/050bd4cd
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/050bd4cd
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/050bd4cd

Branch: refs/heads/branch-3.1
Commit: 050bd4cd2a25fe0f2e028470c7a8572742e71df0
Parents: 099e9fb
Author: Eric Yang <eyang@apache.org>
Authored: Mon Mar 26 13:21:35 2018 -0400
Committer: Billie Rinaldi <billie@apache.org>
Committed: Thu Apr 26 08:26:10 2018 -0700

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


http://git-wip-us.apache.org/repos/asf/hadoop/blob/050bd4cd/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 1290a6c..4109921 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
@@ -565,12 +565,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: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org


Mime
View raw message