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
This commit is contained in:
parent
463a8ca9a5
commit
ef5ca103f6
|
@ -124,6 +124,9 @@ Release 0.23.3 - UNRELEASED
|
||||||
MAPREDUCE-3983. TestTTResourceReporting can fail, and should just be
|
MAPREDUCE-3983. TestTTResourceReporting can fail, and should just be
|
||||||
deleted (Ravi Prakash via bobby)
|
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
|
Release 0.23.2 - UNRELEASED
|
||||||
|
|
||||||
INCOMPATIBLE CHANGES
|
INCOMPATIBLE CHANGES
|
||||||
|
|
|
@ -172,7 +172,8 @@ public class LinuxContainerExecutor extends ContainerExecutor {
|
||||||
int exitCode = shExec.getExitCode();
|
int exitCode = shExec.getExitCode();
|
||||||
LOG.warn("Exit code from container is : " + exitCode);
|
LOG.warn("Exit code from container is : " + exitCode);
|
||||||
logOutput(shExec.getOutput());
|
logOutput(shExec.getOutput());
|
||||||
throw new IOException("App initialization failed (" + exitCode + ")", e);
|
throw new IOException("App initialization failed (" + exitCode +
|
||||||
|
") with output: " + shExec.getOutput(), e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue