Author: harsh
Date: Fri Jul 13 08:45:53 2012
New Revision: 1361100
URL: http://svn.apache.org/viewvc?rev=1361100&view=rev
Log:
Revert MAPREDUCE-4422 from branch-2 until further comments are addressed.
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1361100&r1=1361099&r2=1361100&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Fri
Jul 13 08:45:53 2012
@@ -161,9 +161,6 @@ Release 2.0.0-alpha - 05-23-2012
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
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java?rev=1361100&r1=1361099&r2=1361100&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
Fri Jul 13 08:45:53 2012
@@ -541,25 +541,10 @@ public class YarnConfiguration extends C
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";
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml?rev=1361100&r1=1361099&r2=1361100&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
(original)
+++
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
Fri Jul 13 08:45:53 2012
@@ -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>
