projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4ea1c46
)
Revert "massage log messages"
author
Peter Palfrader
<peter@palfrader.org>
Fri, 2 Mar 2018 12:25:34 +0000
(13:25 +0100)
committer
Peter Palfrader
<peter@palfrader.org>
Fri, 2 Mar 2018 12:25:34 +0000
(13:25 +0100)
This reverts commit
caa87132c4be1e1de8c71dc2a421ca2f0413f583
.
modules/bacula/files/dsa-bacula-scheduler
patch
|
blob
|
history
diff --git
a/modules/bacula/files/dsa-bacula-scheduler
b/modules/bacula/files/dsa-bacula-scheduler
index
cefcb2b
..
b14add3
100755
(executable)
--- a/
modules/bacula/files/dsa-bacula-scheduler
+++ b/
modules/bacula/files/dsa-bacula-scheduler
@@
-322,14
+322,14
@@
for t in TYPESL:
run_cnt += len(current_backups[t])
total_slots += max_jobs[t]
if len(candidates[t]) == 0:
run_cnt += len(current_backups[t])
total_slots += max_jobs[t]
if len(candidates[t]) == 0:
- logger.info("No candidates for %s
(%s) jobs", t
, TYPES_COMPLETE_NAME[t])
+ logger.info("No candidates for %s
jobs"
, TYPES_COMPLETE_NAME[t])
continue
free_slots = min(total_slots - run_cnt, total_free)
if free_slots <= 0:
continue
free_slots = min(total_slots - run_cnt, total_free)
if free_slots <= 0:
- logger.info("No free slots for %s
(%s) jobs but %d candidate(s)", t
, TYPES_COMPLETE_NAME[t], len(candidates[t]))
+ logger.info("No free slots for %s
jobs but %d candidate(s)"
, TYPES_COMPLETE_NAME[t], len(candidates[t]))
continue
continue
- logger.info("Have %d candidate(s) and %d free slots for %s
(%s) jobs.", len(candidates[t]), free_slots, t
, TYPES_COMPLETE_NAME[t])
+ logger.info("Have %d candidate(s) and %d free slots for %s
jobs.", len(candidates[t]), free_slots
, 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'])
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'])