MAPREDUCE-6472. MapReduce AM should have java.io.tmpdir=./tmp to be consistent with tasks. Contributed by Naganarasimha G R
(cherry picked from commit 62943b8e3a
)
This commit is contained in:
parent
2b78714c68
commit
52f56524d4
|
@ -321,6 +321,9 @@ Release 2.7.2 - UNRELEASED
|
|||
MAPREDUCE-6474. ShuffleHandler can possibly exhaust nodemanager file
|
||||
descriptors (Kuhu Shukla via jlowe)
|
||||
|
||||
MAPREDUCE-6472. MapReduce AM should have java.io.tmpdir=./tmp to be
|
||||
consistent with tasks (Naganarasimha G R via jlowe)
|
||||
|
||||
Release 2.7.1 - 2015-07-06
|
||||
|
||||
INCOMPATIBLE CHANGES
|
||||
|
|
|
@ -402,6 +402,10 @@ public class YARNRunner implements ClientProtocol {
|
|||
vargs.add(MRApps.crossPlatformifyMREnv(jobConf, Environment.JAVA_HOME)
|
||||
+ "/bin/java");
|
||||
|
||||
Path amTmpDir =
|
||||
new Path(MRApps.crossPlatformifyMREnv(conf, Environment.PWD),
|
||||
YarnConfiguration.DEFAULT_CONTAINER_TEMP_DIR);
|
||||
vargs.add("-Djava.io.tmpdir=" + amTmpDir);
|
||||
MRApps.addLog4jSystemProperties(null, vargs, conf);
|
||||
|
||||
// Check for Java Lib Path usage in MAP and REDUCE configs
|
||||
|
|
|
@ -461,7 +461,8 @@ public class TestYARNRunner extends TestCase {
|
|||
int adminPos = -1;
|
||||
int userIndex = 0;
|
||||
int userPos = -1;
|
||||
|
||||
int tmpDirPos = -1;
|
||||
|
||||
for(String command : commands) {
|
||||
if(command != null) {
|
||||
assertFalse("Profiler should be disabled by default",
|
||||
|
@ -473,11 +474,16 @@ public class TestYARNRunner extends TestCase {
|
|||
userPos = command.indexOf("-Xmx1024m");
|
||||
if(userPos >= 0)
|
||||
userIndex = index;
|
||||
|
||||
tmpDirPos = command.indexOf("-Djava.io.tmpdir=");
|
||||
}
|
||||
|
||||
index++;
|
||||
}
|
||||
|
||||
|
||||
// Check java.io.tmpdir opts are set in the commands
|
||||
assertTrue("java.io.tmpdir is not set for AM", tmpDirPos > 0);
|
||||
|
||||
// Check both admin java opts and user java opts are in the commands
|
||||
assertTrue("AM admin command opts not in the commands.", adminPos > 0);
|
||||
assertTrue("AM user command opts not in the commands.", userPos > 0);
|
||||
|
|
Loading…
Reference in New Issue