[Bacula-commits] SF.net SVN: bacula:[8754] trunk/bacula

[<ri...@us...>]

Revision: 8754
          http://bacula.svn.sourceforge.net/bacula/?rev=8754&view=rev
Author:   ricozz
Date:     2009-04-27 15:43:34 +0000 (Mon, 27 Apr 2009)

Log Message:
-----------
ebl  Fix bug #1274 where a migration job can be canceled like the
     original job by the MaxRunTime directive.

Modified Paths:
--------------
    trunk/bacula/src/dird/job.c
    trunk/bacula/src/dird/migrate.c
    trunk/bacula/src/jcr.h
    trunk/bacula/technotes

Modified: trunk/bacula/src/dird/job.c
===================================================================
--- trunk/bacula/src/dird/job.c	2009-04-27 15:10:59 UTC (rev 8753)
+++ trunk/bacula/src/dird/job.c	2009-04-27 15:43:34 UTC (rev 8754)
@@ -506,7 +506,7 @@
    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;
       }

Modified: trunk/bacula/src/dird/migrate.c
===================================================================
--- trunk/bacula/src/dird/migrate.c	2009-04-27 15:10:59 UTC (rev 8753)
+++ trunk/bacula/src/dird/migrate.c	2009-04-27 15:43:34 UTC (rev 8754)
@@ -208,6 +208,9 @@
    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);

Modified: trunk/bacula/src/jcr.h
===================================================================
--- trunk/bacula/src/jcr.h	2009-04-27 15:10:59 UTC (rev 8753)
+++ trunk/bacula/src/jcr.h	2009-04-27 15:43:34 UTC (rev 8754)
@@ -326,6 +326,7 @@
    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 */
 
 

Modified: trunk/bacula/technotes
===================================================================
--- trunk/bacula/technotes	2009-04-27 15:10:59 UTC (rev 8753)
+++ trunk/bacula/technotes	2009-04-27 15:43:34 UTC (rev 8754)
@@ -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


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.