ebl Fix bug #1274 where a migration job can be canceled like the

     original job by the MaxRunTime directive.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8754 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/dird/job.c b/bacula/src/dird/job.c
index 252a89a8651692c35c91dddb0490e0dd2ec4e0a7..08a99127dcda0f3493c2ef2b76e0bb0c22687814 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;
       }

diff --git a/bacula/src/dird/migrate.c b/bacula/src/dird/migrate.c
index 4521cf02aabc37f91d0606606361269703782960..afb8606200b70fe585dd552f9abfee97abbd6c3f 100644 (file)
--- a/bacula/src/dird/migrate.c
+++ b/bacula/src/dird/migrate.c
@@ -208,6 +208,9 @@ bool do_migration_init(JCR *jcr)
    mig_jcr->jr.PoolId = jcr->jr.PoolId;
    mig_jcr->jr.JobId = mig_jcr->JobId;
 
+   /* Don't let WatchDog checks Max*Time value on this Job */
+   mig_jcr->no_maxtime = 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 dac2a7b4eece4529da559a201d15d286ae5b284d..f227bbf5198befd4dbc7eab6b7abd935fb7531de 100644 (file)
--- a/bacula/src/jcr.h
+++ b/bacula/src/jcr.h
@@ -326,6 +326,7 @@ public:
    bool VSS;                          /* VSS used by FD */
    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 */
 #endif /* DIRECTOR_DAEMON */
 
 

diff --git a/bacula/technotes b/bacula/technotes
index 2689c92747b438be31ce0cdee609723533f8f7ea..99b858e1cdbc5ef2349bcb4d384ba79b2392ee63 100644 (file)
--- a/bacula/technotes
+++ b/bacula/technotes
@@ -3,6 +3,8 @@
 General:
 
 27Apr09
+ebl  Fix bug #1274 where a migration job can be canceled like the
+     original job by the MaxRunTime directive.
 mvw  Added fix for bug #1275 where acl or xattr data is saved for
      virtual filenames generated by filed plugins.
 26Apr09