Skip to content

[SPARK-2898] [PySpark] fix bugs in deamon.py #1842

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
davies wants to merge 4 commits into from
Closed

[SPARK-2898] [PySpark] fix bugs in deamon.py #1842

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0cd0817
fix bugs in deamon.py
davies Aug 7, 2014
32cb829
fix lint
davies Aug 7, 2014
03a2e8c
cleanup dead children every seconds
davies Aug 7, 2014
f0ea451
fix lint
davies Aug 7, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
cleanup dead children every seconds
  • Loading branch information
@davies
davies committed Aug 7, 2014
commit 03a2e8c9c31cc1dcf5b04612b85443c76953c9ce
7 changes: 4 additions & 3 deletions python/pyspark/daemon.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,13 +119,16 @@ def handle_sigterm(*args):
try:
while True:
try:
ready_fds = select.select([0, listen_sock], [], [])[0]
ready_fds = select.select([0, listen_sock], [], [], 1)[0]
except select.error as ex:
if ex[0] == EINTR:
continue
else:
raise

# cleanup in signal handler will cause deadlock
cleanup_dead_children()

if 0 in ready_fds:
try:
worker_pid = read_int(sys.stdin)
Expand All @@ -145,8 +148,6 @@ def handle_sigterm(*args):
continue
raise

# cleanup in signal handler will cause deadlock
cleanup_dead_children()

# Launch a worker process
try:
Expand Down