aboutsummaryrefslogtreecommitdiff
path: root/bin/pyspark
diff options
context:
space:
mode:
authorDavies Liu <davies@databricks.com>2015-03-16 16:26:55 -0700
committerJosh Rosen <joshrosen@databricks.com>2015-03-16 16:26:55 -0700
commite3f315ac358dfe4f5b9705c3eac76e8b1e24f82a (patch)
treebb196e4f6d31ed2b98abb03ca0c5da1cafcc8b99 /bin/pyspark
parentf149b8b5e542af44650923d0156f037121b45a20 (diff)
downloadspark-e3f315ac358dfe4f5b9705c3eac76e8b1e24f82a.tar.gz
spark-e3f315ac358dfe4f5b9705c3eac76e8b1e24f82a.tar.bz2
spark-e3f315ac358dfe4f5b9705c3eac76e8b1e24f82a.zip
[SPARK-6327] [PySpark] fix launch spark-submit from python
SparkSubmit should be launched without setting PYSPARK_SUBMIT_ARGS cc JoshRosen , this mode is actually used by python unit test, so I will not add more test for it. Author: Davies Liu <davies@databricks.com> Closes #5019 from davies/fix_submit and squashes the following commits: 2c20b0c [Davies Liu] fix launch spark-submit from python
Diffstat (limited to 'bin/pyspark')
-rwxr-xr-xbin/pyspark1
1 files changed, 0 insertions, 1 deletions
diff --git a/bin/pyspark b/bin/pyspark
index e7f6a1a072..776b28dc41 100755
--- a/bin/pyspark
+++ b/bin/pyspark
@@ -89,7 +89,6 @@ export PYTHONSTARTUP="$SPARK_HOME/python/pyspark/shell.py"
if [[ -n "$SPARK_TESTING" ]]; then
unset YARN_CONF_DIR
unset HADOOP_CONF_DIR
- export PYSPARK_SUBMIT_ARGS=pyspark-shell
if [[ -n "$PYSPARK_DOC_TEST" ]]; then
exec "$PYSPARK_DRIVER_PYTHON" -m doctest $1
else