From: Kern Sibbald <kern@sibbald.com>
Date: Tue, 26 Jul 2005 09:34:29 +0000 (+0000)
Subject: - Modify mtx-changer to wait a maximum of 300 seconds.
X-Git-Tag: Release-1.38.0~247
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=65b9a1493c169b219bc57627e1abfca16482c227;p=bacula%2Fbacula

- Modify mtx-changer to wait a maximum of 300 seconds.
- Do restart of failed jobs only for Backups job types.
- A number of DVD updates from Nicolas.


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

diff --git a/bacula/kes-1.37 b/bacula/kes-1.37
index 0a8ada9834..98a506754d 100644
--- a/bacula/kes-1.37
+++ b/bacula/kes-1.37
@@ -4,6 +4,10 @@
 General:
 
 Changes to 1.37.32:
+26Jul05
+- Modify mtx-changer to wait a maximum of 300 seconds.
+- Do restart of failed jobs only for Backups job types.
+- A number of DVD updates from Nicolas.
 24Jul05
 - Turn off old service helper code in Win32.
 - Correct Messages bug found by Phil in stored.
diff --git a/bacula/scripts/mtx-changer.in b/bacula/scripts/mtx-changer.in
index c153426f28..e390913b50 100644
--- a/bacula/scripts/mtx-changer.in
+++ b/bacula/scripts/mtx-changer.in
@@ -42,14 +42,14 @@ TMPDIR=@working_dir@
 # The purpose of this function to wait a maximum 
 #   time for the drive. It will
 #   return as soon as the drive is ready, or after
-#   waiting a maximum of 180 seconds.
+#   waiting a maximum of 300 seconds.
 # Note, this is very system dependent, so if you are
 #   not running on Linux, you will probably need to
 #   re-write it, or at least change the grep target.
 #
 wait_for_drive() {
   i=0 
-  while [ $i -le 180 ]; do  # Wait max 180 seconds
+  while [ $i -le 300 ]; do  # Wait max 300 seconds
     if mt -f $1 status | grep ONLINE  >/dev/null 2>&1; then
       break
     fi
diff --git a/bacula/src/dird/jobq.c b/bacula/src/dird/jobq.c
index acbdba743f..c1f5a7866d 100755
--- a/bacula/src/dird/jobq.c
+++ b/bacula/src/dird/jobq.c
@@ -471,6 +471,7 @@ void *jobq_server(void *arg)
              jcr->JobStatus != JS_Terminated &&
              jcr->JobStatus != JS_Canceled &&
              jcr->job->RescheduleTimes > 0 &&
+             jcr->JobType == JT_BACKUP &&
              jcr->reschedule_count < jcr->job->RescheduleTimes) {
              char dt[50];
 
diff --git a/bacula/src/version.h b/bacula/src/version.h
index 607cf92d66..ee0897e86f 100644
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -1,8 +1,8 @@
 /* */
 #undef  VERSION
 #define VERSION "1.37.32"
-#define BDATE   "24 July 2005"
-#define LSMDATE "24Jul05"
+#define BDATE   "26 July 2005"
+#define LSMDATE "26Jul05"
 
 /* Debug flags */
 #undef  DEBUG