121f9338ce
Launcher is implemented as a Java application and sometimes I'd like to apply Java options.
One situation I have met is the time I try to attach debugger to Launcher.
Launcher is launched from bin/spark-class but there is no room to apply Java options.
```
build_command() {
"$RUNNER" -Xmx128m -cp "$LAUNCH_CLASSPATH" org.apache.spark.launcher.Main "$"
printf "%d\0" $?
}
```
Considering that it's not so many times to apply Java options to Launcher, one compromise would just modify spark-class by user like as follows.
```
build_command() {
"$RUNNER" -Xmx128m $SPARK_LAUNCHER_OPTS -cp "$LAUNCH_CLASSPATH" org.apache.spark.launcher.Main "$"
printf "%d\0" $?
}
```
But it doesn't work when any text related to Java options is output to standard output because whole output is used as command-string for spark-shell and spark-submit in current implementation.
One example is jdwp. When apply agentlib option to use jdwp for debug, we will get output like as follows.
```
Listening for transport dt_socket at address: 9876
```
The output shown above is not a command-string so spark-submit and spark-shell will fail.
To enable Java options for Launcher, we need treat command-string and others.
I changed launcher/Main.java and bin/spark-class to print separator-character and treat it.
## How was this patch tested?
Tested manually using Spark Shell with / without LAUNCHER_JAVA_OPTIONS like as follows.
```
SPARK_LAUNCHER_OPTS="-agentlib:jdwp=transport=dt_socket,suspend=y,address=localhost:9876,server=y" bin/spark-shell
```
Closes #25265 from sarutak/add-spark-launcher-opts.
Authored-by: Kousuke Saruta <sarutak@oss.nttdata.com>
Signed-off-by: Marcelo Vanzin <vanzin@cloudera.com>
112 lines
3.5 KiB
Bash
Executable file
112 lines
3.5 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.
|
|
#
|
|
|
|
if [ -z "${SPARK_HOME}" ]; then
|
|
source "$(dirname "$0")"/find-spark-home
|
|
fi
|
|
|
|
. "${SPARK_HOME}"/bin/load-spark-env.sh
|
|
|
|
# Find the java binary
|
|
if [ -n "${JAVA_HOME}" ]; then
|
|
RUNNER="${JAVA_HOME}/bin/java"
|
|
else
|
|
if [ "$(command -v java)" ]; then
|
|
RUNNER="java"
|
|
else
|
|
echo "JAVA_HOME is not set" >&2
|
|
exit 1
|
|
fi
|
|
fi
|
|
|
|
# Find Spark jars.
|
|
if [ -d "${SPARK_HOME}/jars" ]; then
|
|
SPARK_JARS_DIR="${SPARK_HOME}/jars"
|
|
else
|
|
SPARK_JARS_DIR="${SPARK_HOME}/assembly/target/scala-$SPARK_SCALA_VERSION/jars"
|
|
fi
|
|
|
|
if [ ! -d "$SPARK_JARS_DIR" ] && [ -z "$SPARK_TESTING$SPARK_SQL_TESTING" ]; then
|
|
echo "Failed to find Spark jars directory ($SPARK_JARS_DIR)." 1>&2
|
|
echo "You need to build Spark with the target \"package\" before running this program." 1>&2
|
|
exit 1
|
|
else
|
|
LAUNCH_CLASSPATH="$SPARK_JARS_DIR/*"
|
|
fi
|
|
|
|
# Add the launcher build dir to the classpath if requested.
|
|
if [ -n "$SPARK_PREPEND_CLASSES" ]; then
|
|
LAUNCH_CLASSPATH="${SPARK_HOME}/launcher/target/scala-$SPARK_SCALA_VERSION/classes:$LAUNCH_CLASSPATH"
|
|
fi
|
|
|
|
# For tests
|
|
if [[ -n "$SPARK_TESTING" ]]; then
|
|
unset YARN_CONF_DIR
|
|
unset HADOOP_CONF_DIR
|
|
fi
|
|
|
|
# The launcher library will print arguments separated by a NULL character, to allow arguments with
|
|
# characters that would be otherwise interpreted by the shell. Read that in a while loop, populating
|
|
# an array that will be used to exec the final command.
|
|
#
|
|
# The exit code of the launcher is appended to the output, so the parent shell removes it from the
|
|
# command array and checks the value to see if the launcher succeeded.
|
|
build_command() {
|
|
"$RUNNER" -Xmx128m $SPARK_LAUNCHER_OPTS -cp "$LAUNCH_CLASSPATH" org.apache.spark.launcher.Main "$@"
|
|
printf "%d\0" $?
|
|
}
|
|
|
|
# Turn off posix mode since it does not allow process substitution
|
|
set +o posix
|
|
CMD=()
|
|
DELIM=$'\n'
|
|
CMD_START_FLAG="false"
|
|
while IFS= read -d "$DELIM" -r ARG; do
|
|
if [ "$CMD_START_FLAG" == "true" ]; then
|
|
CMD+=("$ARG")
|
|
else
|
|
if [ "$ARG" == $'\0' ]; then
|
|
# After NULL character is consumed, change the delimiter and consume command string.
|
|
DELIM=''
|
|
CMD_START_FLAG="true"
|
|
elif [ "$ARG" != "" ]; then
|
|
echo "$ARG"
|
|
fi
|
|
fi
|
|
done < <(build_command "$@")
|
|
|
|
COUNT=${#CMD[@]}
|
|
LAST=$((COUNT - 1))
|
|
LAUNCHER_EXIT_CODE=${CMD[$LAST]}
|
|
|
|
# Certain JVM failures result in errors being printed to stdout (instead of stderr), which causes
|
|
# the code that parses the output of the launcher to get confused. In those cases, check if the
|
|
# exit code is an integer, and if it's not, handle it as a special error case.
|
|
if ! [[ $LAUNCHER_EXIT_CODE =~ ^[0-9]+$ ]]; then
|
|
echo "${CMD[@]}" | head -n-1 1>&2
|
|
exit 1
|
|
fi
|
|
|
|
if [ $LAUNCHER_EXIT_CODE != 0 ]; then
|
|
exit $LAUNCHER_EXIT_CODE
|
|
fi
|
|
|
|
CMD=("${CMD[@]:0:$LAST}")
|
|
exec "${CMD[@]}"
|