spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From van...@apache.org
Subject spark git commit: [SPARK-9270] [PYSPARK] allow --name option in pyspark
Date Fri, 24 Jul 2015 18:57:16 GMT
Repository: spark
Updated Branches:
  refs/heads/master 8399ba148 -> 9a1139611


[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


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/9a113961
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/9a113961
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/9a113961

Branch: refs/heads/master
Commit: 9a11396113d4bb0e76e0520df4fc58e7a8ec9f69
Parents: 8399ba1
Author: Cheolsoo Park <cheolsoop@netflix.com>
Authored: Fri Jul 24 11:56:55 2015 -0700
Committer: Marcelo Vanzin <vanzin@cloudera.com>
Committed: Fri Jul 24 11:56:55 2015 -0700

----------------------------------------------------------------------
 bin/pyspark             | 2 +-
 bin/pyspark2.cmd        | 2 +-
 python/pyspark/shell.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/9a113961/bin/pyspark
----------------------------------------------------------------------
diff --git a/bin/pyspark b/bin/pyspark
index f9dbddf..8f2a3b5 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" "$@"

http://git-wip-us.apache.org/repos/asf/spark/blob/9a113961/bin/pyspark2.cmd
----------------------------------------------------------------------
diff --git a/bin/pyspark2.cmd b/bin/pyspark2.cmd
index 45e9e3d..3c61699 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" %*

http://git-wip-us.apache.org/repos/asf/spark/blob/9a113961/python/pyspark/shell.py
----------------------------------------------------------------------
diff --git a/python/pyspark/shell.py b/python/pyspark/shell.py
index 144cdf0..9933129 100644
--- a/python/pyspark/shell.py
+++ b/python/pyspark/shell.py
@@ -40,7 +40,7 @@ if os.environ.get("ADD_FILES") is not None:
 if os.environ.get("SPARK_EXECUTOR_URI"):
     SparkContext.setSystemProperty("spark.executor.uri", os.environ["SPARK_EXECUTOR_URI"])
 
-sc = SparkContext(appName="PySparkShell", pyFiles=add_files)
+sc = SparkContext(pyFiles=add_files)
 atexit.register(lambda: sc.stop())
 
 try:


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org


Mime
View raw message