| commit | 1b00dd8375c4c0cd032e6fc9326c7e9c86831e3f | [log] [tgz] |
|---|---|---|
| author | Eric Yang <eyang@apache.org> | Mon Mar 26 13:21:35 2018 -0400 |
| committer | Hanisha Koneru <hanishakoneru@apache.org> | Mon Mar 26 11:11:04 2018 -0700 |
| tree | d17f33c933d2e1560b84e00b4c1befe21aec2d44 | |
| parent | d8d171f32692f5eb5add4d0fe58c1ab947d53b7f [diff] |
YARN-8043. Added the exception message for failed launches running under LCE.
Contributed by Shane Kumpf
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 @@ 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();