Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 23 additions & 5 deletions python/pyspark/accumulators.py
Original file line number Diff line number Diff line change
Expand Up @@ -266,11 +266,29 @@ def handle(self) -> None:
auth_token = self.server.auth_token # type: ignore[attr-defined]

def poll(func: Callable[[], bool]) -> None:
while not self.server.server_shutdown: # type: ignore[attr-defined]
# Poll every 1 second for new data -- don't block in case of shutdown.
r, _, _ = select.select([self.rfile], [], [], 1)
if self.rfile in r and func():
break
rlist = [self.rfile.fileno()]
poller = None
try:
if os.name == "posix":
# On posix systems use poll to avoid problems with file descriptor numbers
# above 1024.
poller = select.poll()
for fd in rlist:
poller.register(fd, select.POLLIN)

while not self.server.server_shutdown: # type: ignore[attr-defined]
# Poll every 1 second for new data -- don't block in case of shutdown.
if poller is not None:
r = [fd for fd, event in poller.poll(1) if event & select.POLLIN]
else:
# If poll is not available, use select.
r, _, _ = select.select(rlist, [], [], 1)
if self.rfile.fileno() in r and func():
break
finally:
if poller is not None:
for fd in rlist:
poller.unregister(fd)

def accum_updates() -> bool:
num_updates = read_int(self.rfile)
Expand Down
20 changes: 18 additions & 2 deletions python/pyspark/daemon.py
Original file line number Diff line number Diff line change
Expand Up @@ -144,10 +144,22 @@ def handle_sigterm(*args):
reuse = os.environ.get("SPARK_REUSE_WORKER")

# Initialization complete
rlist = [0, listen_sock.fileno()]
poller = None
try:
if os.name == "posix":
# On posix systems use poll to avoid problems with file descriptor numbers above 1024.
poller = select.poll()
for fd in rlist:
poller.register(fd, select.POLLIN)

while True:
try:
ready_fds = select.select([0, listen_sock], [], [], 1)[0]
if poller is not None:
ready_fds = [fd for fd, event in poller.poll(1)]
else:
# If poll is not available, use select.
ready_fds = select.select(rlist, [], [], 1)[0]
except select.error as ex:
if ex[0] == EINTR:
continue
Expand All @@ -165,7 +177,7 @@ def handle_sigterm(*args):
except OSError:
pass # process already died

if listen_sock in ready_fds:
if listen_sock.fileno() in ready_fds:
try:
sock, _ = listen_sock.accept()
except OSError as e:
Expand Down Expand Up @@ -238,6 +250,10 @@ def handle_sigterm(*args):
sock.close()

finally:
if poller is not None:
for fd in rlist:
poller.unregister(fd)

shutdown(1)


Expand Down