Reverting MAPREDUCE-4422 from trunk until all comments are addressed
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1361107 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
48c1a2bdfc
commit
bea60b6c86
|
@ -159,9 +159,6 @@ Branch-2 ( Unreleased changes )
|
|||
MAPREDUCE-3906. Fix inconsistency in documentation regarding
|
||||
mapreduce.jobhistory.principal. (Eugene Koontz via harsh)
|
||||
|
||||
MAPREDUCE-4422. YARN_APPLICATION_CLASSPATH needs a documented default
|
||||
value in YarnConfiguration. (Ahmed Radwan via harsh)
|
||||
|
||||
OPTIMIZATIONS
|
||||
|
||||
BUG FIXES
|
||||
|
|
|
@ -541,25 +541,10 @@ public class YarnConfiguration extends Configuration {
|
|||
public static final long DEFAULT_NM_PROCESS_KILL_WAIT_MS =
|
||||
2000;
|
||||
|
||||
/**
|
||||
* CLASSPATH for YARN applications. A comma-separated list of CLASSPATH
|
||||
* entries
|
||||
*/
|
||||
/** Standard Hadoop classes */
|
||||
public static final String YARN_APPLICATION_CLASSPATH = YARN_PREFIX
|
||||
+ "application.classpath";
|
||||
|
||||
/**
|
||||
* Default CLASSPATH for YARN applications. A comma-separated list of
|
||||
* CLASSPATH entries
|
||||
*/
|
||||
public static final String DEFAULT_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/*," +
|
||||
"$YARN_HOME/share/hadoop/mapreduce/*," +
|
||||
"$YARN_HOME/share/hadoop/mapreduce/lib/*";
|
||||
|
||||
/** Container temp directory */
|
||||
public static final String DEFAULT_CONTAINER_TEMP_DIR = "./tmp";
|
||||
|
||||
|
|
|
@ -538,9 +538,16 @@
|
|||
</property>
|
||||
|
||||
<property>
|
||||
<description>CLASSPATH for YARN applications. A comma-separated list
|
||||
of CLASSPATH entries</description>
|
||||
<description>Classpath for typical applications.</description>
|
||||
<name>yarn.application.classpath</name>
|
||||
<value>$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/*,$YARN_HOME/share/hadoop/mapreduce/*,$YARN_HOME/share/hadoop/mapreduce/lib/*</value>
|
||||
<value>
|
||||
$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/*,
|
||||
$YARN_HOME/share/hadoop/mapreduce/*,
|
||||
$YARN_HOME/share/hadoop/mapreduce/lib/*
|
||||
</value>
|
||||
</property>
|
||||
</configuration>
|
||||
|
|
Loading…
Reference in New Issue