Skip to content
Snippets Groups Projects
  • wangfei's avatar
    267fdffe
    [SPARK-2925] [sql]fix spark-sql and start-thriftserver shell bugs when set --driver-java-options · 267fdffe
    wangfei authored
    https://issues.apache.org/jira/browse/SPARK-2925
    
    Run cmd like this will get the error
    bin/spark-sql --driver-java-options '-Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,address=8788,server=y,suspend=y'
    
    Error: Unrecognized option '-Xnoagent'.
    Run with --help for usage help or --verbose for debug output
    
    Author: wangfei <wangfei_hello@126.com>
    Author: wangfei <wangfei1@huawei.com>
    
    Closes #1851 from scwf/patch-2 and squashes the following commits:
    
    516554d [wangfei] quote variables to fix this issue
    8bd40f2 [wangfei] quote variables to fix this problem
    e6d79e3 [wangfei] fix start-thriftserver bug when set driver-java-options
    948395d [wangfei] fix spark-sql error when set --driver-java-options
    267fdffe
    History
    [SPARK-2925] [sql]fix spark-sql and start-thriftserver shell bugs when set --driver-java-options
    wangfei authored
    https://issues.apache.org/jira/browse/SPARK-2925
    
    Run cmd like this will get the error
    bin/spark-sql --driver-java-options '-Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,address=8788,server=y,suspend=y'
    
    Error: Unrecognized option '-Xnoagent'.
    Run with --help for usage help or --verbose for debug output
    
    Author: wangfei <wangfei_hello@126.com>
    Author: wangfei <wangfei1@huawei.com>
    
    Closes #1851 from scwf/patch-2 and squashes the following commits:
    
    516554d [wangfei] quote variables to fix this issue
    8bd40f2 [wangfei] quote variables to fix this problem
    e6d79e3 [wangfei] fix start-thriftserver bug when set driver-java-options
    948395d [wangfei] fix spark-sql error when set --driver-java-options
spark-sql 2.35 KiB
#!/usr/bin/env bash

#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements.  See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License.  You may obtain a copy of the License at
#
#    http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

#
# Shell script for starting the Spark SQL CLI

# Enter posix mode for bash
set -o posix

CLASS="org.apache.spark.sql.hive.thriftserver.SparkSQLCLIDriver"

# Figure out where Spark is installed
FWDIR="$(cd `dirname $0`/..; pwd)"

function usage {
  echo "Usage: ./bin/spark-sql [options] [cli option]"
  pattern="usage"
  pattern+="\|Spark assembly has been built with Hive"
  pattern+="\|NOTE: SPARK_PREPEND_CLASSES is set"
  pattern+="\|Spark Command: "
  pattern+="\|--help"
  pattern+="\|======="

  $FWDIR/bin/spark-submit --help 2>&1 | grep -v Usage 1>&2
  echo
  echo "CLI options:"
  $FWDIR/bin/spark-class $CLASS --help 2>&1 | grep -v "$pattern" 1>&2
}

function ensure_arg_number {
  arg_number=$1
  at_least=$2

  if [[ $arg_number -lt $at_least ]]; then
    usage
    exit 1
  fi
}

if [[ "$@" = --help ]] || [[ "$@" = -h ]]; then
  usage
  exit 0
fi

CLI_ARGS=()
SUBMISSION_ARGS=()

while (($#)); do
  case $1 in
    -d | --define | --database | -f | -h | --hiveconf | --hivevar | -i | -p)
      ensure_arg_number $# 2
      CLI_ARGS+=("$1"); shift
      CLI_ARGS+=("$1"); shift
      ;;

    -e)
      ensure_arg_number $# 2
      CLI_ARGS+=("$1"); shift
      CLI_ARGS+=("$1"); shift
      ;;

    -s | --silent)
      CLI_ARGS+=("$1"); shift
      ;;

    -v | --verbose)
      # Both SparkSubmit and SparkSQLCLIDriver recognizes -v | --verbose
      CLI_ARGS+=("$1")
      SUBMISSION_ARGS+=("$1"); shift
      ;;

    *)
      SUBMISSION_ARGS+=("$1"); shift
      ;;
  esac
done

exec "$FWDIR"/bin/spark-submit --class $CLASS "${SUBMISSION_ARGS[@]}" spark-internal "${CLI_ARGS[@]}"