Merge branch 'master' into benc-interchange-SIGKILL-warning

Parsl · Aug 8, 2024 · 0e55a88 · 0e55a88
2 parents 750fdf1 + 114e701
commit 0e55a88
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/parsl/executors/taskvine/executor.py b/parsl/executors/taskvine/executor.py
@@ -589,11 +589,13 @@ def shutdown(self, *args, **kwargs):
         # Join all processes before exiting
         logger.debug("Joining on submit process")
         self._submit_process.join()
+        self._submit_process.close()
         logger.debug("Joining on collector thread")
         self._collector_thread.join()
         if self.worker_launch_method == 'factory':
             logger.debug("Joining on factory process")
             self._factory_process.join()
+            self._factory_process.close()
 
         # Shutdown multiprocessing queues
         self._ready_task_queue.close()

diff --git a/parsl/executors/workqueue/executor.py b/parsl/executors/workqueue/executor.py
@@ -704,6 +704,8 @@ def shutdown(self, *args, **kwargs):
 
         logger.debug("Joining on submit process")
         self.submit_process.join()
+        self.submit_process.close()
+
         logger.debug("Joining on collector thread")
         self.collector_thread.join()