This is an automated email from the ASF dual-hosted git repository. vanzin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push: new c624f5d [SPARK-26733][K8S] Cleanup entrypoint.sh. c624f5d is described below commit c624f5d683dbe1338932f06cdcbe1ff172612dca Author: Marcelo Vanzin <van...@cloudera.com> AuthorDate: Tue Feb 5 16:00:18 2019 -0800 [SPARK-26733][K8S] Cleanup entrypoint.sh. Merge both case statements, and remove unused variables that are not set by the Scala code anymore. Author: Marcelo Vanzin <van...@cloudera.com> Closes #23655 from vanzin/SPARK-26733. --- .../src/main/dockerfiles/spark/entrypoint.sh | 32 ++++------------------ 1 file changed, 6 insertions(+), 26 deletions(-) diff --git a/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/entrypoint.sh b/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/entrypoint.sh index 2d77007..613febc 100755 --- a/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/entrypoint.sh +++ b/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/entrypoint.sh @@ -36,19 +36,6 @@ if [ -z "$uidentry" ] ; then fi fi -SPARK_K8S_CMD="$1" -case "$SPARK_K8S_CMD" in - driver | driver-py | driver-r | executor) - shift 1 - ;; - "") - ;; - *) - echo "Non-spark-on-k8s command provided, proceeding in pass-through mode..." - exec /sbin/tini -s -- "$@" - ;; -esac - SPARK_CLASSPATH="$SPARK_CLASSPATH:${SPARK_HOME}/jars/*" env | grep SPARK_JAVA_OPT_ | sort -t_ -k4 -n | sed 's/[^=]*=\(.*\)/\1/g' > /tmp/java_opts.txt readarray -t SPARK_EXECUTOR_JAVA_OPTS < /tmp/java_opts.txt @@ -61,16 +48,6 @@ if [ -n "$PYSPARK_FILES" ]; then PYTHONPATH="$PYTHONPATH:$PYSPARK_FILES" fi -PYSPARK_ARGS="" -if [ -n "$PYSPARK_APP_ARGS" ]; then - PYSPARK_ARGS="$PYSPARK_APP_ARGS" -fi - -R_ARGS="" -if [ -n "$R_APP_ARGS" ]; then - R_ARGS="$R_APP_ARGS" -fi - if [ "$PYSPARK_MAJOR_PYTHON_VERSION" == "2" ]; then pyv="$(python -V 2>&1)" export PYTHON_VERSION="${pyv:7}" @@ -87,8 +64,9 @@ if ! [ -z ${HADOOP_CONF_DIR+x} ]; then SPARK_CLASSPATH="$HADOOP_CONF_DIR:$SPARK_CLASSPATH"; fi -case "$SPARK_K8S_CMD" in +case "$1" in driver) + shift 1 CMD=( "$SPARK_HOME/bin/spark-submit" --conf "spark.driver.bindAddress=$SPARK_DRIVER_BIND_ADDRESS" @@ -97,6 +75,7 @@ case "$SPARK_K8S_CMD" in ) ;; executor) + shift 1 CMD=( ${JAVA_HOME}/bin/java "${SPARK_EXECUTOR_JAVA_OPTS[@]}" @@ -113,8 +92,9 @@ case "$SPARK_K8S_CMD" in ;; *) - echo "Unknown command: $SPARK_K8S_CMD" 1>&2 - exit 1 + echo "Non-spark-on-k8s command provided, proceeding in pass-through mode..." + CMD=("$@") + ;; esac # Execute the container CMD under tini for better hygiene --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org