azkaban-aplcache

fix start up script for better hadoop and hive jar/conf classpath resolution

2/18/2014 9:37:55 PM

Chenjie Yu

Commit: fe71ae1

Tree: e21d678

Parents: cfef617

Changes

src/package/execserver/bin/azkaban-executor-start.sh 14(+6 -8)

src/package/soloserver/bin/azkaban-solo-start.sh 14(+6 -8)

src/package/webserver/bin/azkaban-web-start.sh 14(+6 -8)

Details

src/package/execserver/bin/azkaban-executor-start.sh 14(+6 -8)

diff --git a/src/package/execserver/bin/azkaban-executor-start.sh b/src/package/execserver/bin/azkaban-executor-start.sh
index 5245714..b60a13e 100755
--- a/src/package/execserver/bin/azkaban-executor-start.sh
+++ b/src/package/execserver/bin/azkaban-executor-start.sh
@@ -22,18 +22,16 @@ do
 done
 
 if [ "HADOOP_HOME" != "" ]; then
-	for file in $HADOOP_HOME/hadoop-core*.jar ;
-	do
-		CLASSPATH=$CLASSPATH:$file
-	done
-	CLASSPATH=$CLASSPATH:$HADOOP_HOME/conf
-    JAVA_LIB_PATH="-Djava.library.path=$HADOOP_HOME/lib/native/Linux-amd64-64"
+        echo "Using Hadoop from $HADOOP_HOME"
+        CLASSPATH=$CLASSPATH:$HADOOP_HOME/conf:$HADOOP_HOME/*
+        JAVA_LIB_PATH="-Djava.library.path=$HADOOP_HOME/lib/native/Linux-amd64-64"
 else
-	echo "Error: HADOOP_HOME is not set. Hadoop job types will not run properly."
+        echo "Error: HADOOP_HOME is not set. Hadoop job types will not run properly."
 fi
 
 if [ "HIVE_HOME" != "" ]; then
-    CLASSPATH=$CLASSPATH:$HIVE_HOME/conf
+        echo "Using Hive from $HIVE_HOME"
+        CLASSPATH=$CLASSPATH:$HIVE_HOME/conf:$HIVE_HOME/lib/*
 fi
 
 echo $azkaban_dir;

src/package/soloserver/bin/azkaban-solo-start.sh 14(+6 -8)

diff --git a/src/package/soloserver/bin/azkaban-solo-start.sh b/src/package/soloserver/bin/azkaban-solo-start.sh
index 7d2fb8b..6beb4ba 100755
--- a/src/package/soloserver/bin/azkaban-solo-start.sh
+++ b/src/package/soloserver/bin/azkaban-solo-start.sh
@@ -22,18 +22,16 @@ do
 done
 
 if [ "HADOOP_HOME" != "" ]; then
-    for file in $HADOOP_HOME/hadoop-core*.jar ;
-    do
-        CLASSPATH=$CLASSPATH:$file
-    done
-    CLASSPATH=$CLASSPATH:$HADOOP_HOME/conf
-    JAVA_LIB_PATH="-Djava.library.path=$HADOOP_HOME/lib/native/Linux-amd64-64"
+        echo "Using Hadoop from $HADOOP_HOME"
+        CLASSPATH=$CLASSPATH:$HADOOP_HOME/conf:$HADOOP_HOME/*
+        JAVA_LIB_PATH="-Djava.library.path=$HADOOP_HOME/lib/native/Linux-amd64-64"
 else
-    echo "Error: HADOOP_HOME is not set. Hadoop job types will not run properly."
+        echo "Error: HADOOP_HOME is not set. Hadoop job types will not run properly."
 fi
 
 if [ "HIVE_HOME" != "" ]; then
-    CLASSPATH=$CLASSPATH:$HIVE_HOME/conf
+        echo "Using Hive from $HIVE_HOME"
+        CLASSPATH=$CLASSPATH:$HIVE_HOME/conf:$HIVE_HOME/lib/*
 fi
 
 echo $azkaban_dir;

src/package/webserver/bin/azkaban-web-start.sh 14(+6 -8)

diff --git a/src/package/webserver/bin/azkaban-web-start.sh b/src/package/webserver/bin/azkaban-web-start.sh
index b0604fd..c2cdd5d 100755
--- a/src/package/webserver/bin/azkaban-web-start.sh
+++ b/src/package/webserver/bin/azkaban-web-start.sh
@@ -22,18 +22,16 @@ do
 done
 
 if [ "HADOOP_HOME" != "" ]; then
-    for file in $HADOOP_HOME/hadoop-core*.jar;
-    do
-        CLASSPATH=$CLASSPATH:$file
-    done
-    CLASSPATH=$CLASSPATH:$HADOOP_HOME/conf
-    JAVA_LIB_PATH="-Djava.library.path=$HADOOP_HOME/lib/native/Linux-amd64-64"
+        echo "Using Hadoop from $HADOOP_HOME"
+        CLASSPATH=$CLASSPATH:$HADOOP_HOME/conf:$HADOOP_HOME/*
+        JAVA_LIB_PATH="-Djava.library.path=$HADOOP_HOME/lib/native/Linux-amd64-64"
 else
-    echo "Error: HADOOP_HOME is not set. Hadoop job types will not run properly."
+        echo "Error: HADOOP_HOME is not set. Hadoop job types will not run properly."
 fi
 
 if [ "HIVE_HOME" != "" ]; then
-    CLASSPATH=$CLASSPATH:$HIVE_HOME/conf
+        echo "Using Hive from $HIVE_HOME"
+        CLASSPATH=$CLASSPATH:$HIVE_HOME/conf:$HIVE_HOME/lib/*
 fi
 
 echo $azkaban_dir;