Guard when workerBarrier is None (#118)

ubarsc · Oct 19, 2024 · 2a84212 · 2a84212
1 parent baef954
commit 2a84212
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/rios/cmdline/rios_computeworker.py b/rios/cmdline/rios_computeworker.py
@@ -81,7 +81,8 @@ def riosRemoteComputeWorker(workerID, host, port, authkey):
     blockListByWorker = dataChan.workerInitData.get('blockListByWorker', None)
     blockList = blockListByWorker[workerID]
 
-    if not controls.concurrency.singleBlockComputeWorkers:
+    if (not controls.concurrency.singleBlockComputeWorkers and
+            hasattr(workerBarrier, 'wait')):
         # Wait at the barrier, so nothing proceeds until all workers have had
         # a chance to start
         computeBarrierTimeout = controls.concurrency.computeBarrierTimeout

diff --git a/rios/structures.py b/rios/structures.py
@@ -967,7 +967,8 @@ def shutdown(self):
         """
         if hasattr(self, 'server'):
             self.server.stop_event.set()
-            self.workerBarrier.abort()
+            if self.workerBarrier is not None:
+                self.workerBarrier.abort()
             futures.wait([self.serverThread])
             self.threadPool.shutdown()