13681: Implement WorkflowRunnerResources hint

[arvados.git] / sdk / cwl / arvados_cwl / task_queue.py

diff --git a/sdk/cwl/arvados_cwl/task_queue.py b/sdk/cwl/arvados_cwl/task_queue.py
index cc3e86e63633b0041399defc86070998d7e32f25..b9fd09807b452c1b06738ef1a7df72fd9dcc8708 100644 (file)
--- a/sdk/cwl/arvados_cwl/task_queue.py
+++ b/sdk/cwl/arvados_cwl/task_queue.py
@@ -1,3 +1,7 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
 import Queue
 import threading
 import logging
@@ -27,7 +31,7 @@ class TaskQueue(object):
                 try:
                     task()
                 except Exception as e:
-                    logger.exception("Unexpected error running task")
+                    logger.exception("Unhandled exception running task")
                     self.error = e
 
                 with self.lock:
@@ -45,7 +49,7 @@ class TaskQueue(object):
         try:
             # Drain queue
             while not self.task_queue.empty():
-                self.task_queue.get()
+                self.task_queue.get(True, .1)
         except Queue.Empty:
             pass