Skip to content

Minor polish on cfexecutor #5233

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

Merged
jrbourbeau merged 1 commit into from
Aug 19, 2021
Merged

Minor polish on cfexecutor #5233

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 4 additions & 6 deletions distributed/cfexecutor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,9 @@ def map(self, fn, *iterables, **kwargs):

fs = self._client.map(fn, *iterables, **self._kwargs)

if isinstance(fs, list):
# Below iterator relies on this being a generator to cancel
# remaining futures
fs = (val for val in fs)
# Below iterator relies on fs being an iterator itself, and not just an iterable
# (such as a list), in order to cancel remaining futures
fs = iter(fs)

# Yield must be hidden in closure so that the tasks are submitted
# before the first iterator value is required.
Expand All @@ -148,8 +147,7 @@ def result_iterator():
yield future.result()
finally:
remaining = list(fs)
for future in remaining:
self._futures.add(future)
self._futures.update(remaining)
self._client.cancel(remaining)

return result_iterator()
Expand Down