Repository: spark Updated Branches: refs/heads/branch-2.1 8579ab5d7 -> cbbe21777
[SPARK-18645][DEPLOY] Fix spark-daemon.sh arguments error lead to throws Unrecognized option ## What changes were proposed in this pull request? spark-daemon.sh will lost single quotes around after #15338. as follows: ``` execute_command nice -n 0 bash /opt/cloudera/parcels/SPARK-2.1.0-cdh5.4.3.d20161129-21.04.38/lib/spark/bin/spark-submit --class org.apache.spark.sql.hive.thriftserver.HiveThriftServer2 --name Thrift JDBC/ODBC Server --conf spark.driver.extraJavaOptions=-XX:+UseG1GC -XX:-HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp ``` With this fix, as follows: ``` execute_command nice -n 0 bash /opt/cloudera/parcels/SPARK-2.1.0-cdh5.4.3.d20161129-21.04.38/lib/spark/bin/spark-submit --class org.apache.spark.sql.hive.thriftserver.HiveThriftServer2 --name 'Thrift JDBC/ODBC Server' --conf 'spark.driver.extraJavaOptions=-XX:+UseG1GC -XX:-HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp' ``` ## How was this patch tested? - Manual tests - Build the package and start-thriftserver.sh with `--conf 'spark.driver.extraJavaOptions=-XX:+UseG1GC -XX:-HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp'` Author: Yuming Wang <wgy...@gmail.com> Closes #16079 from wangyum/SPARK-18645. (cherry picked from commit 2ab8551e79e1655c406c358b21c0a1e719f498be) Signed-off-by: Sean Owen <so...@cloudera.com> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/cbbe2177 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/cbbe2177 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/cbbe2177 Branch: refs/heads/branch-2.1 Commit: cbbe217777173b100de2f5a613c46428974826f6 Parents: 8579ab5 Author: Yuming Wang <wgy...@gmail.com> Authored: Thu Dec 1 14:14:09 2016 +0100 Committer: Sean Owen <so...@cloudera.com> Committed: Thu Dec 1 14:14:19 2016 +0100 ---------------------------------------------------------------------- sbin/spark-daemon.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/cbbe2177/sbin/spark-daemon.sh ---------------------------------------------------------------------- diff --git a/sbin/spark-daemon.sh b/sbin/spark-daemon.sh index 061019a..c227c98 100755 --- a/sbin/spark-daemon.sh +++ b/sbin/spark-daemon.sh @@ -124,9 +124,8 @@ if [ "$SPARK_NICENESS" = "" ]; then fi execute_command() { - local command="$@" if [ -z ${SPARK_NO_DAEMONIZE+set} ]; then - nohup -- $command >> $log 2>&1 < /dev/null & + nohup -- "$@" >> $log 2>&1 < /dev/null & newpid="$!" echo "$newpid" > "$pid" @@ -143,12 +142,12 @@ execute_command() { sleep 2 # Check if the process has died; in that case we'll tail the log so the user can see if [[ ! $(ps -p "$newpid" -o comm=) =~ "java" ]]; then - echo "failed to launch $command:" + echo "failed to launch: $@" tail -2 "$log" | sed 's/^/ /' echo "full log in $log" fi else - $command + "$@" fi } @@ -176,11 +175,11 @@ run_command() { case "$mode" in (class) - execute_command nice -n "$SPARK_NICENESS" "${SPARK_HOME}"/bin/spark-class $command $@ + execute_command nice -n "$SPARK_NICENESS" "${SPARK_HOME}"/bin/spark-class "$command" "$@" ;; (submit) - execute_command nice -n "$SPARK_NICENESS" bash "${SPARK_HOME}"/bin/spark-submit --class $command $@ + execute_command nice -n "$SPARK_NICENESS" bash "${SPARK_HOME}"/bin/spark-submit --class "$command" "$@" ;; (*) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
