You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by gk...@apache.org on 2011/09/27 01:46:38 UTC
svn commit: r1176134 - in /hadoop/common/branches/branch-0.20-security-205:
CHANGES.txt src/contrib/vaidya/src/java/org/apache/hadoop/vaidya/vaidya.sh
Author: gkesavan
Date: Mon Sep 26 23:46:37 2011
New Revision: 1176134
URL: http://svn.apache.org/viewvc?rev=1176134&view=rev
Log:
MAPREDUCE-3801. Fix for vaidya.sh to work with the new layout. Contributed by Suhas
Modified:
hadoop/common/branches/branch-0.20-security-205/CHANGES.txt
hadoop/common/branches/branch-0.20-security-205/src/contrib/vaidya/src/java/org/apache/hadoop/vaidya/vaidya.sh
Modified: hadoop/common/branches/branch-0.20-security-205/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/CHANGES.txt?rev=1176134&r1=1176133&r2=1176134&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-205/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security-205/CHANGES.txt Mon Sep 26 23:46:37 2011
@@ -214,6 +214,9 @@ Release 0.20.205.0 - 2011.09.12
HDFS-2359. Fix NullPointerException in DataBlockScanner.
(Jonthan Eagles via suresh)
+ MAPREDUCE-3801. Fix for vaidya.sh to work with the new layout
+ (Suhas via gkesavan)
+
IMPROVEMENTS
MAPREDUCE-2928. MR-2413 improvements (Eli Collins via mattf)
Modified: hadoop/common/branches/branch-0.20-security-205/src/contrib/vaidya/src/java/org/apache/hadoop/vaidya/vaidya.sh
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/src/contrib/vaidya/src/java/org/apache/hadoop/vaidya/vaidya.sh?rev=1176134&r1=1176133&r2=1176134&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-205/src/contrib/vaidya/src/java/org/apache/hadoop/vaidya/vaidya.sh (original)
+++ hadoop/common/branches/branch-0.20-security-205/src/contrib/vaidya/src/java/org/apache/hadoop/vaidya/vaidya.sh Mon Sep 26 23:46:37 2011
@@ -32,16 +32,75 @@ bin=`cd "$bin"; pwd`
this="$bin/$script"
# Check if HADOOP_HOME AND JAVA_HOME is set.
-if [ -z $HADOOP_HOME ] ; then
- echo "HADOOP_HOME environment variable not defined"
+if [ -z "$HADOOP_HOME" ] && [ -z "$HADOOP_PREFIX" ] ; then
+ echo "HADOOP_HOME or HADOOP_PREFIX environment variable should be defined"
exit -1;
fi
-if [ -z $JAVA_HOME ] ; then
+if [ -z "$JAVA_HOME" ] ; then
echo "JAVA_HOME environment variable not defined"
exit -1;
fi
-hadoopVersion=`$HADOOP_HOME/bin/hadoop version | awk 'BEGIN { RS = "" ; FS = "\n" } ; { print $1 }' | awk '{print $2}'`
+if [ -z "$HADOOP_PREFIX" ]; then
+ hadoopVersion=`$HADOOP_HOME/bin/hadoop version | awk 'BEGIN { RS = "" ; FS = "\n" } ; { print $1 }' | awk '{print $2}'`
+else
+ hadoopVersion=`$HADOOP_PREFIX/bin/hadoop version | awk 'BEGIN { RS = "" ; FS = "\n" } ; { print $1 }' | awk '{print $2}'`
+fi
+
+# so that filenames w/ spaces are handled correctly in loops below
+IFS=
+
+# for releases, add core hadoop jar to CLASSPATH
+if [ -e $HADOOP_PREFIX/share/hadoop/hadoop-core-* ]; then
+ for f in $HADOOP_PREFIX/share/hadoop/hadoop-core-*.jar; do
+ CLASSPATH=${CLASSPATH}:$f;
+ done
+
+ # add libs to CLASSPATH
+ for f in $HADOOP_PREFIX/share/hadoop/lib/*.jar; do
+ CLASSPATH=${CLASSPATH}:$f;
+ done
+else
+ # tarball layout
+ if [ -e $HADOOP_HOME/hadoop-core-* ]; then
+ for f in $HADOOP_HOME/hadoop-core-*.jar; do
+ CLASSPATH=${CLASSPATH}:$f;
+ done
+ fi
+ if [ -e $HADOOP_HOME/build/hadoop-core-* ]; then
+ for f in $HADOOP_HOME/build/hadoop-core-*.jar; do
+ CLASSPATH=${CLASSPATH}:$f;
+ done
+ fi
+ for f in $HADOOP_HOME/lib/*.jar; do
+ CLASSPATH=${CLASSPATH}:$f;
+ done
+
+ if [ -d "$HADOOP_HOME/build/ivy/lib/Hadoop/common" ]; then
+ for f in $HADOOP_HOME/build/ivy/lib/Hadoop/common/*.jar; do
+ CLASSPATH=${CLASSPATH}:$f;
+ done
+ fi
+fi
+
+# Set the Vaidya home
+if [ -d "$HADOOP_PREFIX/share/hadoop/contrib/vaidya/" ]; then
+ VAIDYA_HOME=$HADOOP_PREFIX/share/hadoop/contrib/vaidya/
+fi
+if [ -d "$HADOOP_HOME/contrib/vaidya" ]; then
+ VAIDYA_HOME=$HADOOP_HOME/contrib/vaidya/
+fi
+if [ -d "$HADOOP_HOME/build/contrib/vaidya" ]; then
+ VAIDYA_HOME=$HADOOP_HOME/build/contrib/vaidya/
+fi
+
+# add user-specified CLASSPATH last
+if [ "$HADOOP_USER_CLASSPATH_FIRST" = "" ] && [ "$HADOOP_CLASSPATH" != "" ]; then
+ CLASSPATH=${CLASSPATH}:${HADOOP_CLASSPATH}
+fi
+
+# restore ordinary behaviour
+unset IFS
-$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 $@
+$JAVA_HOME/bin/java -Xmx1024m -classpath $VAIDYA_HOME/hadoop-vaidya-${hadoopVersion}.jar:${CLASSPATH} org.apache.hadoop.vaidya.postexdiagnosis.PostExPerformanceDiagnoser $@