You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by to...@apache.org on 2009/09/18 16:33:55 UTC
svn commit: r816647 - in /hadoop/mapreduce/trunk: CHANGES.txt
src/contrib/vaidya/src/java/org/apache/hadoop/vaidya/vaidya.sh
Author: tomwhite
Date: Fri Sep 18 14:33:54 2009
New Revision: 816647
URL: http://svn.apache.org/viewvc?rev=816647&view=rev
Log:
MAPREDUCE-941. Vaidya script fails on Solaris. Contributed by Chad Metcalf.
Modified:
hadoop/mapreduce/trunk/CHANGES.txt
hadoop/mapreduce/trunk/src/contrib/vaidya/src/java/org/apache/hadoop/vaidya/vaidya.sh
Modified: hadoop/mapreduce/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/CHANGES.txt?rev=816647&r1=816646&r2=816647&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/CHANGES.txt (original)
+++ hadoop/mapreduce/trunk/CHANGES.txt Fri Sep 18 14:33:54 2009
@@ -668,3 +668,6 @@
MAPREDUCE-1003. Fix compilation problem in eclipse plugin when
eclipse.home is set. (Ravi Gummadi via yhemanth)
+ MAPREDUCE-941. Vaidya script fails on Solaris. (Chad Metcalf
+ via tomwhite)
+
Modified: hadoop/mapreduce/trunk/src/contrib/vaidya/src/java/org/apache/hadoop/vaidya/vaidya.sh
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/contrib/vaidya/src/java/org/apache/hadoop/vaidya/vaidya.sh?rev=816647&r1=816646&r2=816647&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/contrib/vaidya/src/java/org/apache/hadoop/vaidya/vaidya.sh (original)
+++ hadoop/mapreduce/trunk/src/contrib/vaidya/src/java/org/apache/hadoop/vaidya/vaidya.sh Fri Sep 18 14:33:54 2009
@@ -42,6 +42,6 @@
exit -1;
fi
-hadoopVersion=`$HADOOP_HOME/bin/hadoop version | awk 'BEGIN { RS = "" ; FS = "\n" } ; { print $1 }' | awk '{print $2}'`
+hadoopVersion=`$HADOOP_HOME/bin/hadoop version | grep Hadoop | awk '{print $2}'`
$JAVA_HOME/bin/java -Xmx1024m -classpath $HADOOP_HOME/hadoop-${hadoopVersion}-core.jar:$HADOOP_HOME/contrib/vaidya/hadoop-${hadoopVersion}-vaidya.jar:$HADOOP_HOME/lib/commons-logging-1.0.4.jar:${CLASSPATH} org.apache.hadoop.vaidya.postexdiagnosis.PostExPerformanceDiagnoser $@