Skip to content
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.

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

Clarify return value of executor.shutdown #2941

Merged
merged 2 commits into from
Nov 6, 2023
Merged
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
2 changes: 1 addition & 1 deletion parsl/executors/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def submit(self, func: Callable, resource_specification: Dict[str, Any], *args:
pass

@abstractmethod
def shutdown(self) -> bool:
def shutdown(self) -> None:
"""Shutdown the executor.

This includes all attached resources such as workers and controllers.
Expand Down
1 change: 0 additions & 1 deletion parsl/executors/taskvine/executor.py
Original file line number Diff line number Diff line change
Expand Up @@ -614,7 +614,6 @@ def shutdown(self, *args, **kwargs):
self._factory_process.join()

logger.debug("TaskVine shutdown completed")
return True

@wrap_with_logs
def _collect_taskvine_results(self):
Expand Down
3 changes: 1 addition & 2 deletions parsl/executors/threads.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,8 @@ def shutdown(self, block=True):

"""
logger.debug("Shutting down executor, which involves waiting for running tasks to complete")
x = self.executor.shutdown(wait=block)
self.executor.shutdown(wait=block)
logger.debug("Done with executor shutdown")
return x

def monitor_resources(self):
"""Resource monitoring sometimes deadlocks when using threads, so this function
Expand Down
1 change: 0 additions & 1 deletion parsl/executors/workqueue/executor.py
Original file line number Diff line number Diff line change
Expand Up @@ -707,7 +707,6 @@ def shutdown(self, *args, **kwargs):
self.collector_thread.join()

logger.debug("Work Queue shutdown completed")
return True

@wrap_with_logs
def _collect_work_queue_results(self):
Expand Down
Loading