Fix bug #1307 AllowHigherDuplicates=no prevents automatic job escalation

[bacula/bacula] / bacula / src / dird / job.c

diff --git a/bacula/src/dird/job.c b/bacula/src/dird/job.c
index 252a89a8651692c35c91dddb0490e0dd2ec4e0a7..3b84fd98e9f7646cfb2fb2427f8bb0f497ad21c8 100644 (file)
--- a/bacula/src/dird/job.c
+++ b/bacula/src/dird/job.c
@@ -506,7 +506,7 @@ static void job_monitor_watchdog(watchdog_t *self)
    foreach_jcr(jcr) {
       bool cancel = false;
 
-      if (jcr->JobId == 0 || job_canceled(jcr)) {
+      if (jcr->JobId == 0 || job_canceled(jcr) || jcr->no_maxtime) {
          Dmsg2(800, "Skipping JCR=%p Job=%s\n", jcr, jcr->Job);
          continue;
       }
@@ -672,6 +672,9 @@ bool allow_duplicate_job(JCR *jcr)
    if (!job->AllowHigherDuplicates) {
       foreach_jcr(djcr) {
          char ec1[50];
+         if (jcr == djcr) {
+            continue;                   /* do not cancel this job */
+         }
          if (strcmp(job->name(), djcr->job->name()) == 0) {
             bool cancel_queued = false;
             if (job->DuplicateJobProximity > 0) {