[prev in list] [next in list] [prev in thread] [next in thread] 

List:       bacula-commits
Subject:    [Bacula-commits] SF.net SVN: bacula: [6001] trunk/bacula
From:       kerns () users ! sourceforge ! net
Date:       2007-11-30 21:29:53
Message-ID: E1IyDQn-0000CP-Up () sc8-pr-svn2 ! sourceforge ! net
[Download RAW message or body]

Revision: 6001
          http://bacula.svn.sourceforge.net/bacula/?rev=6001&view=rev
Author:   kerns
Date:     2007-11-30 13:29:53 -0800 (Fri, 30 Nov 2007)

Log Message:
-----------
This patch fixes bug #1012 where the job is canceled because
     of Max Run Time exceeded when the job has not yet started.

Modified Paths:
--------------
    trunk/bacula/src/dird/job.c
    trunk/bacula/technotes-2.3

Added Paths:
-----------
    trunk/bacula/patches/2.2.6-maxruntime.patch

Added: trunk/bacula/patches/2.2.6-maxruntime.patch
===================================================================
--- trunk/bacula/patches/2.2.6-maxruntime.patch	                        (rev 0)
+++ trunk/bacula/patches/2.2.6-maxruntime.patch	2007-11-30 21:29:53 UTC (rev 6001)
@@ -0,0 +1,34 @@
+  This patch fixes bug #1012 where the job is canceled because
+  of Max Run Time exceeded when the job has not yet started.
+
+  Apply it to 2.2.6 or any prior 2.2.x version with:
+
+  cd <bacula-source>
+  patch -p0 <2.2.6-maxruntime.patch
+  ./configure <your-options>
+  make
+  ...
+  make install
+
+
+Index: src/dird/job.c
+===================================================================
+--- src/dird/job.c	(revision 5979)
++++ src/dird/job.c	(working copy)
+@@ -556,7 +556,7 @@
+  */
+ static bool job_check_maxruntime(JCR *control_jcr, JCR *jcr)
+ {
+-   if (jcr->job->MaxRunTime == 0 || job_canceled(jcr)) {
++   if (jcr->job->MaxRunTime == 0 || job_canceled(jcr) || jcr->JobStatus == \
JS_Created) { +       return false;
+    }
+    if ((watchdog_time - jcr->start_time) < jcr->job->MaxRunTime) {
+@@ -931,6 +931,7 @@
+ {
+    jcr->job = job;
+    jcr->JobType = job->JobType;
++   jcr->JobStatus = JS_Created;
+    switch (jcr->JobType) {
+    case JT_ADMIN:
+    case JT_RESTORE:

Modified: trunk/bacula/src/dird/job.c
===================================================================
--- trunk/bacula/src/dird/job.c	2007-11-30 21:28:39 UTC (rev 6000)
+++ trunk/bacula/src/dird/job.c	2007-11-30 21:29:53 UTC (rev 6001)
@@ -556,7 +556,7 @@
  */
 static bool job_check_maxruntime(JCR *control_jcr, JCR *jcr)
 {
-   if (jcr->job->MaxRunTime == 0 || job_canceled(jcr)) {
+   if (jcr->job->MaxRunTime == 0 || job_canceled(jcr) || jcr->JobStatus == \
JS_Created) {  return false;
    }
    if ((watchdog_time - jcr->start_time) < jcr->job->MaxRunTime) {
@@ -931,6 +931,7 @@
 {
    jcr->job = job;
    jcr->JobType = job->JobType;
+   jcr->JobStatus = JS_Created;
    switch (jcr->JobType) {
    case JT_ADMIN:
    case JT_RESTORE:

Modified: trunk/bacula/technotes-2.3
===================================================================
--- trunk/bacula/technotes-2.3	2007-11-30 21:28:39 UTC (rev 6000)
+++ trunk/bacula/technotes-2.3	2007-11-30 21:29:53 UTC (rev 6001)
@@ -1,6 +1,9 @@
               Technical notes on version 2.3
 
 General:
+30Nov07
+kes  This patch fixes bug #1012 where the job is canceled because
+      of Max Run Time exceeded when the job has not yet started.
 29Nov07
 ebl  Apply Richard Mortimer patch that fixes #1016 when there are more than 
      one "part" to write.  Instead of each part being stored on disk, 


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

-------------------------------------------------------------------------
SF.Net email is sponsored by: The Future of Linux Business White Paper
from Novell.  From the desktop to the data center, Linux is going
mainstream.  Let it simplify your IT future.
http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4
_______________________________________________
Bacula-commits mailing list
Bacula-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bacula-commits


[prev in list] [next in list] [prev in thread] [next in thread]