949e393101
Deals with two issues: 1. Spark shell didn't correctly pass quoted arguments to spark-submit. ```./bin/spark-shell --driver-java-options "-Dfoo=f -Dbar=b"``` 2. Spark submit used deprecated environment variables (SPARK_CLASSPATH) which triggered warnings. Now we use new, more narrowly scoped, variables. Author: Patrick Wendell <pwendell@gmail.com> Closes #576 from pwendell/spark-submit and squashes the following commits: 67004c9 [Patrick Wendell] SPARK-1654 and SPARK-1653: Fixes in spark-submit.
44 lines
1.4 KiB
Bash
Executable file
44 lines
1.4 KiB
Bash
Executable file
#!/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.
|
|
#
|
|
|
|
export SPARK_HOME="$(cd `dirname $0`/..; pwd)"
|
|
ORIG_ARGS=$@
|
|
|
|
while (($#)); do
|
|
if [ "$1" = "--deploy-mode" ]; then
|
|
DEPLOY_MODE=$2
|
|
elif [ "$1" = "--driver-memory" ]; then
|
|
DRIVER_MEMORY=$2
|
|
elif [ "$1" = "--driver-library-path" ]; then
|
|
export SPARK_SUBMIT_LIBRARY_PATH=$2
|
|
elif [ "$1" = "--driver-class-path" ]; then
|
|
export SPARK_SUBMIT_CLASSPATH=$2
|
|
elif [ "$1" = "--driver-java-options" ]; then
|
|
export SPARK_SUBMIT_OPTS=$2
|
|
fi
|
|
shift
|
|
done
|
|
|
|
if [ ! -z $DRIVER_MEMORY ] && [ ! -z $DEPLOY_MODE ] && [ $DEPLOY_MODE = "client" ]; then
|
|
export SPARK_MEM=$DRIVER_MEMORY
|
|
fi
|
|
|
|
$SPARK_HOME/bin/spark-class org.apache.spark.deploy.SparkSubmit $ORIG_ARGS
|
|
|