diff options
| author | Davies Liu <davies@databricks.com> | 2014-11-14 20:13:46 -0800 |
|---|---|---|
| committer | Andrew Or <andrew@databricks.com> | 2014-11-14 20:14:33 -0800 |
| commit | 7fe08b43c78bf9e8515f671e72aa03a83ea782f8 (patch) | |
| tree | 9a8fbee009b7f6fc52f11092d90bdb5ace361df0 /bin/pyspark2.cmd | |
| parent | 303a4e4d23e5cd93b541480cf88d5badb9cf9622 (diff) | |
| download | spark-7fe08b43c78bf9e8515f671e72aa03a83ea782f8.tar.gz spark-7fe08b43c78bf9e8515f671e72aa03a83ea782f8.tar.bz2 spark-7fe08b43c78bf9e8515f671e72aa03a83ea782f8.zip | |
[SPARK-4415] [PySpark] JVM should exit after Python exit
When JVM is started in a Python process, it should exit once the stdin is closed.
test: add spark.driver.memory in conf/spark-defaults.conf
```
daviesdm:~/work/spark$ cat conf/spark-defaults.conf
spark.driver.memory 8g
daviesdm:~/work/spark$ bin/pyspark
>>> quit
daviesdm:~/work/spark$ jps
4931 Jps
286
daviesdm:~/work/spark$ python wc.py
943738
0.719928026199
daviesdm:~/work/spark$ jps
286
4990 Jps
```
Author: Davies Liu <davies@databricks.com>
Closes #3274 from davies/exit and squashes the following commits:
df0e524 [Davies Liu] address comments
ce8599c [Davies Liu] address comments
050651f [Davies Liu] JVM should exit after Python exit
Diffstat (limited to 'bin/pyspark2.cmd')
| -rw-r--r-- | bin/pyspark2.cmd | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/bin/pyspark2.cmd b/bin/pyspark2.cmd index 59415e9bde..a542ec80b4 100644 --- a/bin/pyspark2.cmd +++ b/bin/pyspark2.cmd @@ -59,7 +59,6 @@ for /f %%i in ('echo %1^| findstr /R "\.py"') do ( ) if [%PYTHON_FILE%] == [] ( - set PYSPARK_SHELL=1 if [%IPYTHON%] == [1] ( ipython %IPYTHON_OPTS% ) else ( |