Prechádzať zdrojové kódy

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

Eric Yang 7 rokov pred
rodič
commit
1b00dd8375

+ 3 - 2
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();