Index: hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java
===================================================================
--- hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java (revision 1486132)
+++ hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java (working copy)
@@ -19,6 +19,7 @@
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.util.Shell;
@InterfaceAudience.Private
@InterfaceStability.Evolving
@@ -653,12 +654,17 @@
public static final String MAPREDUCE_APPLICATION_CLASSPATH =
"mapreduce.application.classpath";
+ static final String HADOOP_MAPRED_HOME =
+ Shell.WINDOWS ?
+ "%HADOOP_MAPRED_HOME%" :
+ "$HADOOP_MAPRED_HOME";
+
/**
* Default CLASSPATH for all YARN MapReduce applications.
*/
public static final String[] DEFAULT_MAPREDUCE_APPLICATION_CLASSPATH = {
- "$HADOOP_MAPRED_HOME/share/hadoop/mapreduce/*",
- "$HADOOP_MAPRED_HOME/share/hadoop/mapreduce/lib/*",
+ HADOOP_MAPRED_HOME + "/share/hadoop/mapreduce/*",
+ HADOOP_MAPRED_HOME + "/share/hadoop/mapreduce/lib/*",
};
public static final String WORKFLOW_ID = "mapreduce.workflow.id";
Index: hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
===================================================================
--- hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml (revision 1486132)
+++ hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml (working copy)
@@ -991,13 +991,6 @@
- CLASSPATH for MR applications. A comma-separated list
- of CLASSPATH entries
- mapreduce.application.classpath
- $HADOOP_MAPRED_HOME/share/hadoop/mapreduce/*,$HADOOP_MAPRED_HOME/share/hadoop/mapreduce/lib/*
-
-
-
mapreduce.job.classloader
false
Whether to use a separate (isolated) classloader for
Index: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
===================================================================
--- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml (revision 1486132)
+++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml (working copy)
@@ -701,13 +701,6 @@
-
- CLASSPATH for YARN applications. A comma-separated list
- of CLASSPATH entries
- yarn.application.classpath
- $HADOOP_CONF_DIR,$HADOOP_COMMON_HOME/share/hadoop/common/*,$HADOOP_COMMON_HOME/share/hadoop/common/lib/*,$HADOOP_HDFS_HOME/share/hadoop/hdfs/*,$HADOOP_HDFS_HOME/share/hadoop/hdfs/lib/*,$HADOOP_YARN_HOME/share/hadoop/yarn/*,$HADOOP_YARN_HOME/share/hadoop/yarn/lib/*
-
-
The interval of the yarn client's querying application state