aboutsummaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorCheolsoo Park <cheolsoop@netflix.com>2015-07-24 11:56:55 -0700
committerMarcelo Vanzin <vanzin@cloudera.com>2015-07-24 11:56:55 -0700
commit9a11396113d4bb0e76e0520df4fc58e7a8ec9f69 (patch)
treed0741e29b034965e62bcd63b22c78ae425f94720 /bin
parent8399ba14873854ab2f80a0ccaf6adba499060365 (diff)
downloadspark-9a11396113d4bb0e76e0520df4fc58e7a8ec9f69.tar.gz
spark-9a11396113d4bb0e76e0520df4fc58e7a8ec9f69.tar.bz2
spark-9a11396113d4bb0e76e0520df4fc58e7a8ec9f69.zip
[SPARK-9270] [PYSPARK] allow --name option in pyspark
This is continuation of #7512 which added `--name` option to spark-shell. This PR adds the same option to pyspark. Note that `--conf spark.app.name` in command-line has no effect in spark-shell and pyspark. Instead, `--name` must be used. This is in fact inconsistency with spark-sql which doesn't accept `--name` option while it accepts `--conf spark.app.name`. I am not fixing this inconsistency in this PR. IMO, one of `--name` and `--conf spark.app.name` is needed not both. But since I cannot decide which to choose, I am not making any change here. Author: Cheolsoo Park <cheolsoop@netflix.com> Closes #7610 from piaozhexiu/SPARK-9270 and squashes the following commits: 763e86d [Cheolsoo Park] Update windows script 400b7f9 [Cheolsoo Park] Allow --name option to pyspark
Diffstat (limited to 'bin')
-rwxr-xr-xbin/pyspark2
-rw-r--r--bin/pyspark2.cmd2
2 files changed, 2 insertions, 2 deletions
diff --git a/bin/pyspark b/bin/pyspark
index f9dbddfa53..8f2a3b5a77 100755
--- a/bin/pyspark
+++ b/bin/pyspark
@@ -82,4 +82,4 @@ fi
export PYSPARK_DRIVER_PYTHON
export PYSPARK_DRIVER_PYTHON_OPTS
-exec "$SPARK_HOME"/bin/spark-submit pyspark-shell-main "$@"
+exec "$SPARK_HOME"/bin/spark-submit pyspark-shell-main --name "PySparkShell" "$@"
diff --git a/bin/pyspark2.cmd b/bin/pyspark2.cmd
index 45e9e3def5..3c6169983e 100644
--- a/bin/pyspark2.cmd
+++ b/bin/pyspark2.cmd
@@ -35,4 +35,4 @@ set PYTHONPATH=%SPARK_HOME%\python\lib\py4j-0.8.2.1-src.zip;%PYTHONPATH%
set OLD_PYTHONSTARTUP=%PYTHONSTARTUP%
set PYTHONSTARTUP=%SPARK_HOME%\python\pyspark\shell.py
-call %SPARK_HOME%\bin\spark-submit2.cmd pyspark-shell-main %*
+call %SPARK_HOME%\bin\spark-submit2.cmd pyspark-shell-main --name "PySparkShell" %*