projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '16339-cwl-schema-refs' refs #16339
[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 1c233fac0ad98f4b0421a4e0856b00fd19d1422f..d75fec6c63e719949d6f19b7d2813d9f828262a6 100644
(file)
--- a/
sdk/cwl/arvados_cwl/task_queue.py
+++ b/
sdk/cwl/arvados_cwl/task_queue.py
@@
-2,7
+2,12
@@
#
# SPDX-License-Identifier: Apache-2.0
#
# SPDX-License-Identifier: Apache-2.0
-import Queue
+from future import standard_library
+standard_library.install_aliases()
+from builtins import range
+from builtins import object
+
+import queue
import threading
import logging
import threading
import logging
@@
-11,13
+16,13
@@
logger = logging.getLogger('arvados.cwl-runner')
class TaskQueue(object):
def __init__(self, lock, thread_count):
self.thread_count = thread_count
class TaskQueue(object):
def __init__(self, lock, thread_count):
self.thread_count = thread_count
- self.task_queue =
Q
ueue.Queue(maxsize=self.thread_count)
+ self.task_queue =
q
ueue.Queue(maxsize=self.thread_count)
self.task_queue_threads = []
self.lock = lock
self.in_flight = 0
self.error = None
self.task_queue_threads = []
self.lock = lock
self.in_flight = 0
self.error = None
- for r in
x
range(0, self.thread_count):
+ for r in range(0, self.thread_count):
t = threading.Thread(target=self.task_queue_func)
self.task_queue_threads.append(t)
t.start()
t = threading.Thread(target=self.task_queue_func)
self.task_queue_threads.append(t)
t.start()
@@
-51,7
+56,7
@@
class TaskQueue(object):
return
self.task_queue.put(task, block=True, timeout=3)
return
return
self.task_queue.put(task, block=True, timeout=3)
return
- except
Q
ueue.Full:
+ except
q
ueue.Full:
pass
finally:
unlock.acquire()
pass
finally:
unlock.acquire()
@@
-62,7
+67,7
@@
class TaskQueue(object):
# Drain queue
while not self.task_queue.empty():
self.task_queue.get(True, .1)
# Drain queue
while not self.task_queue.empty():
self.task_queue.get(True, .1)
- except
Q
ueue.Empty:
+ except
q
ueue.Empty:
pass
def join(self):
pass
def join(self):