diff options
author | Matthew Farrellee <matt@redhat.com> | 2014-06-28 18:39:27 -0700 |
---|---|---|
committer | Aaron Davidson <aaron@databricks.com> | 2014-06-28 18:39:48 -0700 |
commit | febec742c82852c736fe09110667e82092f2e5f9 (patch) | |
tree | 5b6f0b4be0ecedfe893a3991e049239070e15ecd /python | |
parent | 2844fbbe715d93313daf01dd3cf44995d78f5547 (diff) | |
download | spark-febec742c82852c736fe09110667e82092f2e5f9.tar.gz spark-febec742c82852c736fe09110667e82092f2e5f9.tar.bz2 spark-febec742c82852c736fe09110667e82092f2e5f9.zip |
[SPARK-1394] Remove SIGCHLD handler in worker subprocess
It should not be the responsibility of the worker subprocess, which
does not intentionally fork, to try and cleanup child processes. Doing
so is complex and interferes with operations such as
platform.system().
If it is desirable to have tighter control over subprocesses, then
namespaces should be used and it should be the manager's resposibility
to handle cleanup.
Author: Matthew Farrellee <matt@redhat.com>
Closes #1247 from mattf/SPARK-1394 and squashes the following commits:
c36f308 [Matthew Farrellee] [SPARK-1394] Remove SIGCHLD handler in worker subprocess
(cherry picked from commit 3c104c79d24425786cec0034f269ba19cf465b31)
Signed-off-by: Aaron Davidson <aaron@databricks.com>
Diffstat (limited to 'python')
-rw-r--r-- | python/pyspark/daemon.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/python/pyspark/daemon.py b/python/pyspark/daemon.py index b2f226a55e..5eb1c63bf2 100644 --- a/python/pyspark/daemon.py +++ b/python/pyspark/daemon.py @@ -103,6 +103,7 @@ def worker(listen_sock): if os.fork() == 0: # Leave the worker pool signal.signal(SIGHUP, SIG_DFL) + signal.signal(SIGCHLD, SIG_DFL) listen_sock.close() # Read the socket using fdopen instead of socket.makefile() because the latter # seems to be very slow; note that we need to dup() the file descriptor because |