fix number of tasks to queue

WIPACrepo · Jul 5, 2016 · 11597ba · 11597ba
1 parent 1ff985c
commit 11597ba
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/iceprod/server/grid.py b/iceprod/server/grid.py
@@ -93,10 +93,10 @@ def queue(self):
             elif self.tasks_queued >= min_tasks:
                 change = 0 # min jobs already queued
             else:
-                num_to_queue = max_tasks - self.tasks_processing
-                if num_to_queue > min_tasks:
-                    num_to_queue = min_tasks - self.tasks_queued
+                num_to_queue = min(max_tasks - self.tasks_processing,
+                                   min_tasks - self.tasks_queued)
                 change = min(change,num_to_queue)
+            logger.info('can queue up to %d tasks', change)
 
             # get queueing datasets from database
             datasets = self.db.queue_get_queueing_datasets(async=False)

diff --git a/iceprod/server/modules/queue.py b/iceprod/server/modules/queue.py
@@ -248,7 +248,7 @@ def queue_loop(self):
                         tasks_on_queue = [1000, 100]
                         if plugin_cfg:
                             tasks_on_queue = plugin_cfg[0]['tasks_on_queue']
-                        num = min(tasks_on_queue[0] - num_queued, tasks_on_queue[1])
+                        num = min(tasks_on_queue[1] - num_queued, tasks_on_queue[0])
                         if num > 0:
                             # get priority factors
                             qf_p = 1.0