Fix #6280 About issue with AllowDuplicate on Copy/Migration jobs

diff --git a/bacula/src/dird/job.c b/bacula/src/dird/job.c
index 91a6d0fc355beca673554203bfe690cca60889c0..2193173eba0a26df4f8858c7c954ae2ce4c0e317 100644 (file)
--- a/bacula/src/dird/job.c
+++ b/bacula/src/dird/job.c
@@ -1170,7 +1170,11 @@ bool allow_duplicate_job(JCR *jcr)
    }
    endeach_jcr(djcr);
 
-   return true;
+   if (jcr->is_canceled()) {
+      return false;             /* stop the job */
+   } else {
+      return true;              /* Keep going */
+   }
 }
 
 /*

diff --git a/bacula/src/dird/mac.c b/bacula/src/dird/mac.c
index a4e773b73a21d1febb2613439a59b048e7f82bba..7bd2d23ae28fa74ff85a40055a49b16f02d9a2b1 100644 (file)
--- a/bacula/src/dird/mac.c
+++ b/bacula/src/dird/mac.c
@@ -90,10 +90,6 @@ bool do_mac_init(JCR *jcr)
 
    apply_pool_overrides(jcr);
 
-   if (!allow_duplicate_job(jcr)) {
-      return false;
-   }
-
    jcr->jr.PoolId = get_or_create_pool_record(jcr, jcr->pool->name());
    if (jcr->jr.PoolId == 0) {
       Dmsg1(dbglevel, "JobId=%d no PoolId\n", (int)jcr->JobId);
@@ -116,6 +112,10 @@ bool do_mac_init(JCR *jcr)
       return false;
    }
 
+   if (!allow_duplicate_job(jcr)) {
+      return false;
+   }
+
    /* If we find a job or jobs to migrate it is previous_jr.JobId */
    count = getJob_to_migrate(jcr);
    if (count < 0) {