Ensure correct client specified when checking for zombies

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

diff --git a/regress/scripts/bacula-dir-tape.conf.in b/regress/scripts/bacula-dir-tape.conf.in
index bf1bb5cc8ad44e34550d6ce332cc5598527b101b..05bfa5b38eb4644e0abcc4691cc2a01eccec950b 100644 (file)
--- a/regress/scripts/bacula-dir-tape.conf.in
+++ b/regress/scripts/bacula-dir-tape.conf.in
@@ -21,6 +21,7 @@ Director {                            # define myself
   Maximum Concurrent Jobs = 4
   Password = "pNvX1WiXnwv2C/F7E52LGvw6rKjbbPvu2kyuPa9pVaL3"
   Messages = Daemon
+  FD Connect Timeout = 2min 
 }
 
 #
@@ -40,6 +41,25 @@ Job {
 # Prefer Mounted Volumes = no
 }
 
+#
+# Note, this client does not exist so the job will
+#   fail
+#
+Job {
+  Name = "Offline"
+  Type = Backup
+  Client=@hostname@-fd1
+  FileSet="Full Set"
+  Storage = DDS-4
+  Messages = Standard
+  Pool = Default
+  Write Bootstrap = "@working_dir@/NightlySave.bsr"
+  Maximum Concurrent Jobs = 4
+  SpoolData = yes
+# Prefer Mounted Volumes = no
+}
+
+
 Job {
   Name = "NightlySave1"
   Type = Backup
@@ -158,6 +178,19 @@ Client {
   Maximum Concurrent Jobs = 4
 }
 
+Client {
+  Name = @hostname@-fd1
+  Address = @hostname@
+  FDPort = 1@fdport@                # nothing should be on this port!!!!!
+  Catalog = MyCatalog
+  Password = "xevrjURYoCHhn26RaJoWbeWXEY/a3VqGKp/37tgWiuHc"          # password for FileDaemon
+  File Retention = 30d                # 30 days
+  Job Retention = 180d                # six months
+  AutoPrune = yes                     # Prune expired Jobs/Files
+  Maximum Concurrent Jobs = 4
+}
+
+
 # Definition of DDS tape storage device
 Storage {
   Name = DDS-4

diff --git a/regress/scripts/check_for_zombie_jobs b/regress/scripts/check_for_zombie_jobs
index d35a5ffc37c3abd454aa57f1b26c31f4dbba8c22..b1f689ee202d98410659b1ef2c71cfd3c8552c40 100755 (executable)
--- a/regress/scripts/check_for_zombie_jobs
+++ b/regress/scripts/check_for_zombie_jobs
@@ -4,19 +4,21 @@
 # Also scan logs for ERROR messages
 #
 
+. ./config         
+
 # check_for_zombie_jobs storage=STORAGE [client=localhost-fd]
 
 if [ $# = 2 ] ; then
     client="$2"
 else 
-    client="client"
+    client=${HOST}-fd
 fi
 
 bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output tmp/dir.out
 status dir
 @output tmp/fd.out
-status $client
+status client=${client}
 @output tmp/sd.out
 status $1
 @output

diff --git a/regress/scripts/functions b/regress/scripts/functions
index dbbc8e734e6268b530dc46965c085fbbe1c3ec93..b583255680a30e79099e059dfc322372a9d97671 100644 (file)
--- a/regress/scripts/functions
+++ b/regress/scripts/functions
@@ -2,6 +2,7 @@
 # A set of useful functions to be sourced in each test
 #
 
+
 start_test()
 {
    # Turn off email
@@ -279,3 +280,4 @@ fi
 
 # Source the configuration variables
 . ${cwd}/config
+

diff --git a/regress/tests/two-pool-test b/regress/tests/two-pool-test
index 9e3fe2b58167b3526f60bee160ee680932f702d2..b5d235ae197ba2c47b033b54a09a33019945c17f 100755 (executable)
--- a/regress/tests/two-pool-test
+++ b/regress/tests/two-pool-test
@@ -23,7 +23,6 @@ scripts/prepare-two-disks
 echo "${cwd}/build" >${cwd}/tmp/file-list
 echo "${cwd}/build" >${cwd}/tmp/file-list
 echo "${cwd}/build" >${cwd}/tmp/file-list
-echo "${cwd}/build" >${cwd}/tmp/file-list
 
 start_test
 
@@ -39,13 +38,11 @@ list volumes
 @# Start job with Client run before and sleep
 run job=NightlySave1 level=Full pool=Default yes
 run job=NightlySave1 level=Full pool=Default yes
-run job=NightlySave1 level=Full pool=Default yes
 @# wait between starting jobs
 @sleep 30
 @#setdebug level=100 storage=DDS-4
 run job=NightlySave2 level=Full pool=Full yes
 run job=NightlySave2 level=Full pool=Full yes
-run job=NightlySave2 level=Full pool=Full yes
 @sleep 10
 messages
 @sleep 10
@@ -60,6 +57,8 @@ messages
 @# now do a restore
 @#
 @$out tmp/log2.out
+release storage=DDS-4 drive=0
+release storage=DDS-4 drive=1
 restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done
 yes
 wait