X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Ffiles%2Fdsa-bacula-scheduler;h=d1bf85f90d9ddd6a36b5a14b22e3cb7f4bf441ca;hb=33d8a6c91f60158a8d6aeaa5f911c000f0bcc280;hp=b14add32b3c481362b007941383a3ff6774fd299;hpb=0e6a2fddf5f78bc1bdeb2f95cc82e83a1b2e458f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/files/dsa-bacula-scheduler b/modules/bacula/files/dsa-bacula-scheduler
index b14add32b..d1bf85f90 100755
--- a/modules/bacula/files/dsa-bacula-scheduler
+++ b/modules/bacula/files/dsa-bacula-scheduler
@@ -90,7 +90,7 @@ SCHED = { 'F': '40d:45d',
           'I': '22h:26h',
           }
 MAX_JOBS = { 'F': 2,
-             'D': 1,
+             'D': 2,
              'I': 2,
              'total': 12,
            }
@@ -238,7 +238,7 @@ cursor.execute("""
   SELECT name, MAX(starttime) AS starttime
   FROM job
   WHERE type='B' AND
-        jobstatus IN ('A', 'f')
+        jobstatus IN ('A', 'f', 'E')
   GROUP BY name
 """, {})
 failed_backups = set()
@@ -322,14 +322,14 @@ for t in TYPESL:
   run_cnt += len(current_backups[t])
   total_slots += max_jobs[t]
   if len(candidates[t]) == 0:
-    logger.info("No candidates for %s jobs", TYPES_COMPLETE_NAME[t])
+    logger.info("No candidates for %s(%s) jobs", t, TYPES_COMPLETE_NAME[t])
     continue
   free_slots = min(total_slots - run_cnt, total_free)
   if free_slots <= 0:
-    logger.info("No free slots for %s jobs but %d candidate(s)", TYPES_COMPLETE_NAME[t], len(candidates[t]))
+    logger.info("No free slots for %s(%s) jobs but %d candidate(s)", t, TYPES_COMPLETE_NAME[t], len(candidates[t]))
     continue
 
-  logger.info("Have %d candidate(s) and %d free slots for %s jobs.", len(candidates[t]), free_slots, TYPES_COMPLETE_NAME[t])
+  logger.info("Have %d candidate(s) and %d free slots for %s(%s) jobs.", len(candidates[t]), free_slots, t, TYPES_COMPLETE_NAME[t])
   picked = random.sample(candidates[t], min(free_slots, len(candidates[t])))
   for p in picked:
     logger.info("  Will run: %s/%s", p['client'], p['level'])