Don't force job duplicate checking on copy and migration jobs.

diff --git a/bacula/src/dird/job.c b/bacula/src/dird/job.c
index d428bd064b6426a410022e1a496d0a604551be2a..b3bee866cc7f94e8f9d07fa05b3c9a84dd5c3a1a 100644 (file)
--- a/bacula/src/dird/job.c
+++ b/bacula/src/dird/job.c
@@ -697,7 +697,7 @@ bool allow_duplicate_job(JCR *jcr)
    JOB *job = jcr->job;
    JCR *djcr;                /* possible duplicate job */
 
-   if (job->AllowDuplicateJobs) {
+   if (jcr->no_check_duplicates || job->AllowDuplicateJobs) {
       return true;
    }
    Dmsg0(800, "Enter allow_duplicate_job\n");

diff --git a/bacula/src/dird/migrate.c b/bacula/src/dird/migrate.c
index 2ee0e0d15b81e473bf5a97060fd828ae27155976..f39fd1b15ac6f492814f1eb0b2fad25b15eafc29 100644 (file)
--- a/bacula/src/dird/migrate.c
+++ b/bacula/src/dird/migrate.c
@@ -213,6 +213,9 @@ bool do_migration_init(JCR *jcr)
    /* Don't let WatchDog checks Max*Time value on this Job */
    mig_jcr->no_maxtime = true;
 
+   /* Don't check for duplicates on migration and copy jobs */
+   mig_jcr->no_check_duplicates = true;
+
    Dmsg4(dbglevel, "mig_jcr: Name=%s JobId=%d Type=%c Level=%c\n",
       mig_jcr->jr.Name, (int)mig_jcr->jr.JobId, 
       mig_jcr->jr.JobType, mig_jcr->jr.JobLevel);

diff --git a/bacula/src/jcr.h b/bacula/src/jcr.h
index 0bdf0a389baf9769afb508729821eb0c1537a03e..f29d6fd1726440ec6474c94dc5212bc4b7dc9c08 100644 (file)
--- a/bacula/src/jcr.h
+++ b/bacula/src/jcr.h
@@ -355,6 +355,7 @@ public:
    bool Encrypt;                      /* Encryption used by FD */
    bool stats_enabled;                /* Keep all job records in a table for long term statistics */
    bool no_maxtime;                   /* Don't check Max*Time for this JCR */
+   bool no_check_duplicates;          /* Don't check duplicates for this JCR */
    bool keep_sd_auth_key;             /* Clear or not the SD auth key after connection*/
    bool use_accurate_chksum;          /* Use or not checksum option in accurate code */
    bool run_pool_override;