Author: acmurthy Date: Tue Sep 25 23:44:33 2012 New Revision: 1390222 URL: http://svn.apache.org/viewvc?rev=1390222&view=rev Log: Merge -c 1390218 from trunk to branch-2 to fix HADOOP-8794. Rename YARN_HOME to HADOOP_YARN_HOME. Contributed by Vinod K V.
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/bin/start-all.sh Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1390222&r1=1390221&r2=1390222&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Tue Sep 25 23:44:33 2012 @@ -51,6 +51,8 @@ Release 2.0.2-alpha - 2012-09-07 HADOOP-8689. Make trash a server side configuration option. (eli) HADOOP-8710. Remove ability for users to easily run the trash emptire. (eli) + + HADOOP-8794. Rename YARN_HOME to HADOOP_YARN_HOME. (vinodkv via acmurthy) NEW FEATURES Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh?rev=1390222&r1=1390221&r2=1390222&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh Tue Sep 25 23:44:33 2012 @@ -268,21 +268,21 @@ fi CLASSPATH=${CLASSPATH}:$HADOOP_HDFS_HOME/$HDFS_DIR'/*' # put yarn in classpath if present -if [ "$YARN_HOME" = "" ]; then +if [ "$HADOOP_YARN_HOME" = "" ]; then if [ -d "${HADOOP_PREFIX}/$YARN_DIR" ]; then - export YARN_HOME=$HADOOP_PREFIX + export HADOOP_YARN_HOME=$HADOOP_PREFIX fi fi -if [ -d "$YARN_HOME/$YARN_DIR/webapps" ]; then - CLASSPATH=${CLASSPATH}:$YARN_HOME/$YARN_DIR +if [ -d "$HADOOP_YARN_HOME/$YARN_DIR/webapps" ]; then + CLASSPATH=${CLASSPATH}:$HADOOP_YARN_HOME/$YARN_DIR fi -if [ -d "$YARN_HOME/$YARN_LIB_JARS_DIR" ]; then - CLASSPATH=${CLASSPATH}:$YARN_HOME/$YARN_LIB_JARS_DIR'/*' +if [ -d "$HADOOP_YARN_HOME/$YARN_LIB_JARS_DIR" ]; then + CLASSPATH=${CLASSPATH}:$HADOOP_YARN_HOME/$YARN_LIB_JARS_DIR'/*' fi -CLASSPATH=${CLASSPATH}:$YARN_HOME/$YARN_DIR'/*' +CLASSPATH=${CLASSPATH}:$HADOOP_YARN_HOME/$YARN_DIR'/*' # put mapred in classpath if present AND different from YARN if [ "$HADOOP_MAPRED_HOME" = "" ]; then @@ -291,7 +291,7 @@ if [ "$HADOOP_MAPRED_HOME" = "" ]; then fi fi -if [ "$HADOOP_MAPRED_HOME/$MAPRED_DIR" != "$YARN_HOME/$YARN_DIR" ] ; then +if [ "$HADOOP_MAPRED_HOME/$MAPRED_DIR" != "$HADOOP_YARN_HOME/$YARN_DIR" ] ; then if [ -d "$HADOOP_MAPRED_HOME/$MAPRED_DIR/webapps" ]; then CLASSPATH=${CLASSPATH}:$HADOOP_MAPRED_HOME/$MAPRED_DIR fi Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/bin/start-all.sh URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/bin/start-all.sh?rev=1390222&r1=1390221&r2=1390222&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/bin/start-all.sh (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/bin/start-all.sh Tue Sep 25 23:44:33 2012 @@ -33,6 +33,6 @@ if [ -f "${HADOOP_HDFS_HOME}"/sbin/start fi # start yarn daemons if yarn is present -if [ -f "${YARN_HOME}"/sbin/start-yarn.sh ]; then - "${YARN_HOME}"/sbin/start-yarn.sh --config $HADOOP_CONF_DIR +if [ -f "${HADOOP_YARN_HOME}"/sbin/start-yarn.sh ]; then + "${HADOOP_YARN_HOME}"/sbin/start-yarn.sh --config $HADOOP_CONF_DIR fi