From ef5ca103f6e8b9bc038103b85697f2fc8d492b19 Mon Sep 17 00:00:00 2001 From: Thomas Graves Date: Tue, 3 Apr 2012 15:39:35 +0000 Subject: [PATCH] merge -r 1308975:1308976 from trunk. FIXES: MAPREDUCE-4012 git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1308985 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../hadoop/yarn/server/nodemanager/LinuxContainerExecutor.java | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index d7a0bf9e201..7633ef48200 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -124,6 +124,9 @@ Release 0.23.3 - UNRELEASED MAPREDUCE-3983. TestTTResourceReporting can fail, and should just be deleted (Ravi Prakash via bobby) + MAPREDUCE-4012 Hadoop Job setup error leaves no useful info to users + (when LinuxTaskController is used). (tgraves) + Release 0.23.2 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/LinuxContainerExecutor.java b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/LinuxContainerExecutor.java index 28f1247bb32..be515377637 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/LinuxContainerExecutor.java +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/LinuxContainerExecutor.java @@ -172,7 +172,8 @@ public class LinuxContainerExecutor extends ContainerExecutor { int exitCode = shExec.getExitCode(); LOG.warn("Exit code from container is : " + exitCode); logOutput(shExec.getOutput()); - throw new IOException("App initialization failed (" + exitCode + ")", e); + throw new IOException("App initialization failed (" + exitCode + + ") with output: " + shExec.getOutput(), e); } }