Repository: bigtop Updated Branches: refs/heads/master a75cca489 -> 682a2a630
BIGTOP-1810: Spark thriftserver service does not indicate success Signed-off-by: Konstantin Boudnik <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/682a2a63 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/682a2a63 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/682a2a63 Branch: refs/heads/master Commit: 682a2a630b64dc24cbd7676ff83a681dc6918935 Parents: a75cca4 Author: Matthew Russell <[email protected]> Authored: Thu Apr 9 15:49:30 2015 +0100 Committer: Konstantin Boudnik <[email protected]> Committed: Tue Apr 28 16:52:33 2015 -0700 ---------------------------------------------------------------------- .../src/common/spark/spark-thriftserver.svc | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/682a2a63/bigtop-packages/src/common/spark/spark-thriftserver.svc ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/spark/spark-thriftserver.svc b/bigtop-packages/src/common/spark/spark-thriftserver.svc index 4eba4a4..39a9748 100644 --- a/bigtop-packages/src/common/spark/spark-thriftserver.svc +++ b/bigtop-packages/src/common/spark/spark-thriftserver.svc @@ -16,7 +16,7 @@ TYPE="thriftserver" DAEMON="spark-${TYPE}" DESC="Spark ${TYPE}" -EXEC_PATH="/usr/lib/spark/sbin/spark-daemon.sh" +EXEC_PATH="/usr/lib/spark/bin/spark-submit" SVC_USER="spark" WORKING_DIR="/var/lib/spark" DAEMON_FLAGS="" @@ -42,10 +42,13 @@ start() { } export SUBMIT_USAGE_FUNCTION=usage - su -s /bin/bash $SVC_USER -c " \ - ${EXEC_PATH} spark-submit org.apache.spark.sql.hive.thriftserver.HiveThriftServer2 1 $DAEMON_FLAGS" + LOG_FILE=/var/log/spark/${DAEMON}.out - sleep 3 + su -s /bin/bash $SVC_USER -c "nohup nice -n 0 \ + ${EXEC_PATH} --class org.apache.spark.sql.hive.thriftserver.HiveThriftServer2 1 $DAEMON_FLAGS \ + > $LOG_FILE 2>&1 & "'echo $!' > "$PIDFILE" + + sleep 7 checkstatusofproc RETVAL=$? @@ -60,8 +63,8 @@ generate_stop() { cat <<'__EOT__' stop() { - su -s /bin/bash $SVC_USER -c " \ - ${EXEC_PATH} stop org.apache.spark.sql.hive.thriftserver.HiveThriftServer2 1" + log_success_msg "Stopping $DESC (${DAEMON}): " + killproc -p $PIDFILE java RETVAL=$? [ $RETVAL -eq $RETVAL_SUCCESS ] && rm -f $LOCKFILE $PIDFILE
