diff options
| author | Kousuke Saruta <sarutak@oss.nttdata.co.jp> | 2014-08-09 21:10:43 -0700 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-08-09 21:11:00 -0700 |
| commit | 4f4a9884d9268ba9808744b3d612ac23c75f105a (patch) | |
| tree | 8cf35287ff81866efd3b3ce95d45ce08891b21a0 /python | |
| parent | e45daf226d780f4a7aaabc2de9f04367bee16f26 (diff) | |
| download | spark-4f4a9884d9268ba9808744b3d612ac23c75f105a.tar.gz spark-4f4a9884d9268ba9808744b3d612ac23c75f105a.tar.bz2 spark-4f4a9884d9268ba9808744b3d612ac23c75f105a.zip | |
[SPARK-2894] spark-shell doesn't accept flags
As sryza reported, spark-shell doesn't accept any flags.
The root cause is wrong usage of spark-submit in spark-shell and it come to the surface by #1801
Author: Kousuke Saruta <sarutak@oss.nttdata.co.jp>
Author: Cheng Lian <lian.cs.zju@gmail.com>
Closes #1715, Closes #1864, and Closes #1861
Closes #1825 from sarutak/SPARK-2894 and squashes the following commits:
47f3510 [Kousuke Saruta] Merge branch 'master' of git://git.apache.org/spark into SPARK-2894
2c899ed [Kousuke Saruta] Removed useless code from java_gateway.py
98287ed [Kousuke Saruta] Removed useless code from java_gateway.py
513ad2e [Kousuke Saruta] Modified util.sh to enable to use option including white spaces
28a374e [Kousuke Saruta] Modified java_gateway.py to recognize arguments
5afc584 [Cheng Lian] Filter out spark-submit options when starting Python gateway
e630d19 [Cheng Lian] Fixing pyspark and spark-shell CLI options
Diffstat (limited to 'python')
| -rw-r--r-- | python/pyspark/java_gateway.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/python/pyspark/java_gateway.py b/python/pyspark/java_gateway.py index 37386ab0d7..c7f7c1fe59 100644 --- a/python/pyspark/java_gateway.py +++ b/python/pyspark/java_gateway.py @@ -39,7 +39,7 @@ def launch_gateway(): submit_args = os.environ.get("PYSPARK_SUBMIT_ARGS") submit_args = submit_args if submit_args is not None else "" submit_args = shlex.split(submit_args) - command = [os.path.join(SPARK_HOME, script), "pyspark-shell"] + submit_args + command = [os.path.join(SPARK_HOME, script)] + submit_args + ["pyspark-shell"] if not on_windows: # Don't send ctrl-c / SIGINT to the Java gateway: def preexec_func(): |