Mailing-List: contact mapreduce-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
Reply-To: mapreduce-dev@hadoop.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r907877 - in /hadoop/mapreduce/branches/branch-0.21:
 CHANGES.txt
 src/contrib/mumak/bin/mumak.sh
Date: Tue, 09 Feb 2010 01:43:34 -0000
To: mapreduce-commits@hadoop.apache.org
From: cdouglas@apache.org
Message-Id: <20100209014334.4794B23889E9@eris.apache.org>

Author: cdouglas
Date: Tue Feb  9 01:43:33 2010
New Revision: 907877

URL: http://svn.apache.org/viewvc?rev=907877&view=rev
Log:
MAPREDUCE-1448. Respect --config option in Mumak script. Contributed by Hong Tang

Modified:
    hadoop/mapreduce/branches/branch-0.21/CHANGES.txt
    hadoop/mapreduce/branches/branch-0.21/src/contrib/mumak/bin/mumak.sh

Modified: hadoop/mapreduce/branches/branch-0.21/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/CHANGES.txt?rev=907877&r1=907876&r2=907877&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/CHANGES.txt (original)
+++ hadoop/mapreduce/branches/branch-0.21/CHANGES.txt Tue Feb  9 01:43:33 2010
@@ -940,3 +940,6 @@
 
     MAPREDUCE-1412. Fix timer granularity issue causing failures in
     TestTaskTrackerBlacklisting. (cdouglas)
+
+    MAPREDUCE-1448. Respect --config option in Mumak script. (Hong Tang via
+    cdouglas)

Modified: hadoop/mapreduce/branches/branch-0.21/src/contrib/mumak/bin/mumak.sh
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/contrib/mumak/bin/mumak.sh?rev=907877&r1=907876&r2=907877&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/contrib/mumak/bin/mumak.sh (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/contrib/mumak/bin/mumak.sh Tue Feb  9 01:43:33 2010
@@ -33,7 +33,7 @@
 # convert relative path to absolute path
 bin=`dirname "$this"`
 bin=`cd "$bin"; pwd`
-script=`basename $bin`
+script=`basename $this`
 this="$bin/$script"
 
 MUMAK_HOME=`dirname $bin`
@@ -96,7 +96,7 @@
 # Hadoop Common jar
 # Hadoop Common test jar
 # Depending 3rd party jars
-CLASSPATH=${MUMAK_HOME}/conf:${HADOOP_HOME}/conf:$JAVA_HOME/lib/tools.jar
+CLASSPATH=${MUMAK_HOME}/conf:${HADOOP_CONF_DIR}:$JAVA_HOME/lib/tools.jar
 
 if [ $IN_RELEASE = 0 ]; then
   CLASSPATH=${CLASSPATH}:${HADOOP_HOME}/build/contrib/${project}/classes
@@ -111,6 +111,10 @@
   for f in $HADOOP_HOME/build/ivy/lib/${project}/common/*.jar; do
     CLASSPATH=${CLASSPATH}:$f;
   done
+
+  for f in $HADOOP_HOME/build/ivy/lib/${project}/test/*.jar; do
+    CLASSPATH=${CLASSPATH}:$f;
+  done
 else
   CLASSPATH=${CLASSPATH}:$HADOOP_HOME;
   for f in $HADOOP_HOME/lib/*.jar; do
@@ -165,7 +169,7 @@
 HADOOP_OPTS="$HADOOP_OPTS -Dhadoop.policy.file=$HADOOP_POLICYFILE"
 
 function print_usage(){
-  echo "Usage: $script trace.json topology.json"
+  echo "Usage: $script [--config dir] trace.json topology.json"
 }
 
 if [ $# != 2 ]; then