Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAPREDUCE-6472. MapReduce AM should have java.io.tmpdir=./tmp to be consistent with tasks. Contributed by Naganarasimha G R

This commit is contained in:
Jason Lowe 2015-09-15 19:43:20 +00:00
parent ce69c9b54c
commit 62943b8e3a
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-mapreduce-project/CHANGES.txt
View File

@ -590,6 +590,9 @@ Release 2.7.2 - UNRELEASED
MAPREDUCE-6474. ShuffleHandler can possibly exhaust nodemanager file MAPREDUCE-6474. ShuffleHandler can possibly exhaust nodemanager file
descriptors (Kuhu Shukla via jlowe) 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 Release 2.7.1 - 2015-07-06
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

4
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/YARNRunner.java
View File

@ -402,6 +402,10 @@ public class YARNRunner implements ClientProtocol {
vargs.add(MRApps.crossPlatformifyMREnv(jobConf, Environment.JAVA_HOME) vargs.add(MRApps.crossPlatformifyMREnv(jobConf, Environment.JAVA_HOME)
+ "/bin/java"); + "/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); MRApps.addLog4jSystemProperties(null, vargs, conf);
// Check for Java Lib Path usage in MAP and REDUCE configs // Check for Java Lib Path usage in MAP and REDUCE configs

10
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestYARNRunner.java
View File

@ -461,7 +461,8 @@ public class TestYARNRunner extends TestCase {
int adminPos = -1; int adminPos = -1;
int userIndex = 0; int userIndex = 0;
int userPos = -1; int userPos = -1;
int tmpDirPos = -1;
for(String command : commands) { for(String command : commands) {
if(command != null) { if(command != null) {
assertFalse("Profiler should be disabled by default", assertFalse("Profiler should be disabled by default",
@ -473,11 +474,16 @@ public class TestYARNRunner extends TestCase {
userPos = command.indexOf("-Xmx1024m"); userPos = command.indexOf("-Xmx1024m");
if(userPos >= 0) if(userPos >= 0)
userIndex = index; userIndex = index;
tmpDirPos = command.indexOf("-Djava.io.tmpdir=");
} }
index++; 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 // 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 admin command opts not in the commands.", adminPos > 0);
assertTrue("AM user command opts not in the commands.", userPos > 0); assertTrue("AM user command opts not in the commands.", userPos > 0);