diff options
| author | Davies Liu <davies@databricks.com> | 2015-02-16 20:32:03 -0800 |
|---|---|---|
| committer | Josh Rosen <joshrosen@databricks.com> | 2015-02-16 20:32:03 -0800 |
| commit | ac6fe67e1d8bf01ee565f9cc09ad48d88a275829 (patch) | |
| tree | a8e7ff61f347aea6c95209e467ea7b8aadd47526 /python/pyspark/worker.py | |
| parent | 0e180bfc3c7f18780d4fc4f42681609832418e43 (diff) | |
| download | spark-ac6fe67e1d8bf01ee565f9cc09ad48d88a275829.tar.gz spark-ac6fe67e1d8bf01ee565f9cc09ad48d88a275829.tar.bz2 spark-ac6fe67e1d8bf01ee565f9cc09ad48d88a275829.zip | |
[SPARK-5363] [PySpark] check ending mark in non-block way
There is chance of dead lock that the Python process is waiting for ending mark from JVM, but which is eaten by corrupted stream.
This PR checks the ending mark from Python in non-block way, so it will not blocked by Python process.
There is a small chance that the ending mark is sent by Python process but not available right now, then Python process will not be used.
cc JoshRosen pwendell
Author: Davies Liu <davies@databricks.com>
Closes #4601 from davies/freeze and squashes the following commits:
e15a8c3 [Davies Liu] update logging
890329c [Davies Liu] Merge branch 'freeze' of github.com:davies/spark into freeze
2bd2228 [Davies Liu] add more logging
656d544 [Davies Liu] Update PythonRDD.scala
05e1085 [Davies Liu] check ending mark in non-block way
Diffstat (limited to 'python/pyspark/worker.py')
| -rw-r--r-- | python/pyspark/worker.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/python/pyspark/worker.py b/python/pyspark/worker.py index 8a93c320ec..180bdbb4c2 100644 --- a/python/pyspark/worker.py +++ b/python/pyspark/worker.py @@ -121,6 +121,7 @@ def main(infile, outfile): write_int(len(_accumulatorRegistry), outfile) for (aid, accum) in _accumulatorRegistry.items(): pickleSer._write_with_length((aid, accum._value), outfile) + outfile.flush() # check end of stream if read_int(infile) == SpecialLengths.END_OF_STREAM: |