start spark worker correctly for version 1.4

This commit is contained in:
Lee moon soo 2015-06-22 17:00:50 -07:00
parent 19f29c0cba
commit 675301da2d
2 changed files with 9 additions and 3 deletions

View file

@ -30,9 +30,9 @@ before_script:
script:
# spark 1.4
- mvn package -Pbuild-distr -Phadoop-2.3 -B
- ./testing/startSparkCluster.sh 1.4.1 2.3
- ./testing/startSparkCluster.sh 1.4.0 2.3
- SPARK_HOME=./spark-1.4.1-bin-hadoop2.3 mvn verify -Pusing-packaged-distr -Phadoop-2.3 -B
- ./testing/stopSparkCluster.sh 1.4.1 2.3
- ./testing/stopSparkCluster.sh 1.4.0 2.3
# spark 1.3
- mvn clean package -DskipTests -Pspark-1.3 -Phadoop-2.3 -B -pl 'zeppelin-interpreter,spark'
- mvn package -Pbuild-distr -Pspark-1.3 -Phadoop-2.3 -B

View file

@ -45,4 +45,10 @@ export SPARK_MASTER_PORT=7071
export SPARK_MASTER_WEBUI_PORT=7072
export SPARK_WORKER_WEBUI_PORT=8082
${SPARK_HOME}/sbin/start-master.sh
${SPARK_HOME}/sbin/start-slave.sh 1 `hostname`:${SPARK_MASTER_PORT}
echo ${SPARK_VERSION} | grep "^1.4" > /dev/null
if [ $? -ne 0 ]; then # spark 1.3 or prior
${SPARK_HOME}/sbin/start-slave.sh 1 `hostname`:${SPARK_MASTER_PORT}
else
${SPARK_HOME}/sbin/start-slave.sh spark://`hostname`:7071
fi