Return-Path: X-Original-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org Delivered-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9C5B6C0F7 for ; Fri, 13 Jul 2012 07:27:53 +0000 (UTC) Received: (qmail 8890 invoked by uid 500); 13 Jul 2012 07:27:53 -0000 Delivered-To: apmail-hadoop-mapreduce-commits-archive@hadoop.apache.org Received: (qmail 8830 invoked by uid 500); 13 Jul 2012 07:27:53 -0000 Mailing-List: contact mapreduce-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: mapreduce-dev@hadoop.apache.org Delivered-To: mailing list mapreduce-commits@hadoop.apache.org Received: (qmail 8810 invoked by uid 99); 13 Jul 2012 07:27:52 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Jul 2012 07:27:52 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Jul 2012 07:27:51 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C7A5D23888D2; Fri, 13 Jul 2012 07:27:31 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1361062 - in /hadoop/common/branches/branch-2/hadoop-mapreduce-project: ./ hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/conf/ hadoop-yarn/hadoop-yarn-common/src/main/resources/ Date: Fri, 13 Jul 2012 07:27:31 -0000 To: mapreduce-commits@hadoop.apache.org From: harsh@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120713072731.C7A5D23888D2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: harsh Date: Fri Jul 13 07:27:31 2012 New Revision: 1361062 URL: http://svn.apache.org/viewvc?rev=1361062&view=rev Log: MAPREDUCE-4422. YARN_APPLICATION_CLASSPATH needs a documented default value in YarnConfiguration. Contributed by Ahmed Radwan. (harsh) 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=1361062&r1=1361061&r2=1361062&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 07:27:31 2012 @@ -161,6 +161,9 @@ 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=1361062&r1=1361061&r2=1361062&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 07:27:31 2012 @@ -541,10 +541,25 @@ public class YarnConfiguration extends C public static final long DEFAULT_NM_PROCESS_KILL_WAIT_MS = 2000; - /** Standard Hadoop classes */ + /** + * CLASSPATH for YARN applications. A comma-separated list of CLASSPATH + * entries + */ 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=1361062&r1=1361061&r2=1361062&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 07:27:31 2012 @@ -538,16 +538,9 @@ - Classpath for typical applications. + 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/*, - $YARN_HOME/share/hadoop/mapreduce/*, - $YARN_HOME/share/hadoop/mapreduce/lib/* - + $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/*