From: Kern Sibbald Date: Sat, 27 Mar 2004 09:10:42 +0000 (+0000) Subject: Before done change X-Git-Tag: Release-1.34.0~31 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8bd785611ef1f93557a1d3ffb2bd81275077f122;p=bacula%2Fbacula Before done change git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1153 91ce42f0-d328-0410-95d8-f526ca767f89 --- diff --git a/regress/scripts/bacula-dir-tape.conf.in b/regress/scripts/bacula-dir-tape.conf.in index c12d7b3fc2..0d6aadce12 100644 --- a/regress/scripts/bacula-dir-tape.conf.in +++ b/regress/scripts/bacula-dir-tape.conf.in @@ -36,6 +36,7 @@ Job { Pool = Default Write Bootstrap = "@working_dir@/NightlySave.bsr" Maximum Concurrent Jobs = 4 + SpoolData = yes } diff --git a/regress/scripts/check_for_zombie_jobs b/regress/scripts/check_for_zombie_jobs new file mode 100755 index 0000000000..5fae9d3e7f --- /dev/null +++ b/regress/scripts/check_for_zombie_jobs @@ -0,0 +1,52 @@ +#!/bin/sh +# +# Check for zombie jobs (not terminated). +# Also scan logs for ERROR messages +# +bin/bconsole -c bin/bconsole.conf <&1 >/dev/null +if [ $? != 0 ] ; then + echo " " + echo " !!!! Zombie Jobs in Director !!!!" + echo " !!!! Zombie Jobs in Director !!!!" >>test.out + echo " " +fi +grep "No Jobs running." tmp/fd.out 2>&1 >/dev/null +if [ $? != 0 ] ; then + echo " " + echo " !!!! Zombie Jobs in File daemon !!!!" + echo " !!!! Zombie Jobs in File daemon !!!!" >>test.out + echo " " +fi +grep "No Jobs running." tmp/sd.out 2>&1 >/dev/null +if [ $? != 0 ] ; then + echo " " + echo " !!!! Zombie Jobs in Storage daemon !!!!" + echo " !!!! Zombie Jobs in Storage daemon !!!!" >>test.out + echo " " +fi +grep "ERROR" tmp/log*.out 2>&1 >/dev/null +if [ $? = 0 ] ; then + echo " " + echo " !!!! ERROR in log output !!!!" + echo " !!!! ERROR in log output !!!!" >>test.out + echo " " +fi +grep "Fatal Error" tmp/log*.out 2>&1 >/dev/null +if [ $? = 0 ] ; then + echo " " + echo " !!!! Fatal Error in log output !!!!" + echo " !!!! Fatal Error in log output !!!!" >>test.out + echo " " +fi + + diff --git a/regress/scripts/cleanup b/regress/scripts/cleanup index 4e13d2bf59..2cb9f56efa 100755 --- a/regress/scripts/cleanup +++ b/regress/scripts/cleanup @@ -7,4 +7,5 @@ rm -rf tmp/original tmp/bacula-restores tmp/Small* tmp/TestVolume* rm -rf tmp/restored tmp/largefile tmp/bscan.bsr tmp/log*.out rm -rf /tmp/sed_tmp /tmp/file-list rm -rf tmp/build tmp/restore-list tmp/restore2-list +rm -rf tmp/fd.out tmp/dir.out tmp/sd.out rm -rf working/log diff --git a/regress/scripts/test-bacula-dir.conf.in b/regress/scripts/test-bacula-dir.conf.in index 348110741c..38af2f88c2 100644 --- a/regress/scripts/test-bacula-dir.conf.in +++ b/regress/scripts/test-bacula-dir.conf.in @@ -37,6 +37,7 @@ Job { Pool = Default Write Bootstrap = "@working_dir@/NightlySave.bsr" Maximum Concurrent Jobs = 4 + SpoolData=yes } Job { diff --git a/regress/scripts/testa-bacula-dir.conf.in b/regress/scripts/testa-bacula-dir.conf.in index 13bbfcd53d..6a2aba0372 100644 --- a/regress/scripts/testa-bacula-dir.conf.in +++ b/regress/scripts/testa-bacula-dir.conf.in @@ -27,6 +27,7 @@ Job { Messages = Standard Write Bootstrap = "@working_dir@/SmallVols.bsr" Pool = SmallVols + SpoolData = yes } diff --git a/regress/tests/backup-bacula-tape b/regress/tests/backup-bacula-tape index ec34dddb81..09b6da925d 100755 --- a/regress/tests/backup-bacula-tape +++ b/regress/tests/backup-bacula-tape @@ -59,6 +59,7 @@ messages @output quit END_OF_DATA +scripts/check_for_zombie_jobs storage=DDS-4 bin/bacula stop 2>&1 >/dev/null grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null bstat=$? diff --git a/regress/tests/backup-bacula-test b/regress/tests/backup-bacula-test index 26d54bc5bf..2d126acd5c 100755 --- a/regress/tests/backup-bacula-test +++ b/regress/tests/backup-bacula-test @@ -39,6 +39,7 @@ messages @output quit END_OF_DATA +scripts/check_for_zombie_jobs storage=File bin/bacula stop 2>&1 >/dev/null grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null bstat=$? diff --git a/regress/tests/bextract-test b/regress/tests/bextract-test index 0587542625..314105bca8 100755 --- a/regress/tests/bextract-test +++ b/regress/tests/bextract-test @@ -43,6 +43,7 @@ messages @output quit END_OF_DATA +scripts/check_for_zombie_jobs storage=File1 bin/bacula stop 2>&1 >/dev/null mkdir -p ${cwd}/tmp/bacula-restores bin/bextract -b working/restore.bsr -c bin/bacula-sd.conf ${cwd}/tmp ${cwd}/tmp/bacula-restores 2>&1 >/dev/null diff --git a/regress/tests/bscan-test b/regress/tests/bscan-test index c41972290a..a7d0bf0400 100755 --- a/regress/tests/bscan-test +++ b/regress/tests/bscan-test @@ -49,6 +49,7 @@ yes messages quit END_OF_DATA +scripts/check_for_zombie_jobs storage=File1 bin/bacula stop 2>&1 >/dev/null echo "volume=TestVolume001|TestVolume002" >tmp/bscan.bsr bin/bscan -w working -m -s -v -b tmp/bscan.bsr -c bin/bacula-sd.conf ${cwd}/tmp 2>&1 >/dev/null @@ -67,6 +68,7 @@ messages @output quit END_OF_DATA +scripts/check_for_zombie_jobs storage=File1 bin/bacula stop 2>&1 >/dev/null grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null bstat=$? diff --git a/regress/tests/bsr-opt-test b/regress/tests/bsr-opt-test index adee285f2b..82eb76e541 100755 --- a/regress/tests/bsr-opt-test +++ b/regress/tests/bsr-opt-test @@ -50,6 +50,7 @@ messages @output quit END_OF_DATA +scripts/check_for_zombie_jobs storage=File1 bin/bacula stop 2>&1 >/dev/null # # This test is not really reliable. What we want to do is diff --git a/regress/tests/compressed-test b/regress/tests/compressed-test index 7857b00bf5..983c114e27 100755 --- a/regress/tests/compressed-test +++ b/regress/tests/compressed-test @@ -35,13 +35,17 @@ messages @# now do a restore @# @output tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select all storage=File +restore where=${cwd}/tmp/bacula-restores select storage=File +unmark * +mark * +done yes wait messages @output quit END_OF_DATA +scripts/check_for_zombie_jobs storage=File bin/bacula stop 2>&1 >/dev/null grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null bstat=$? diff --git a/regress/tests/concurrent-jobs-test b/regress/tests/concurrent-jobs-test index 99bb1cd186..1877e0b200 100755 --- a/regress/tests/concurrent-jobs-test +++ b/regress/tests/concurrent-jobs-test @@ -51,13 +51,17 @@ messages @# now do a restore @# @output tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select all storage=File +restore where=${cwd}/tmp/bacula-restores select storage=File +unmark * +mark * +done yes wait messages @output quit END_OF_DATA +scripts/check_for_zombie_jobs storage=File bin/bacula stop 2>&1 >/dev/null grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null diff --git a/regress/tests/decremental-test b/regress/tests/decremental-test index cc6abbcfe3..2e40a3f04e 100755 --- a/regress/tests/decremental-test +++ b/regress/tests/decremental-test @@ -38,6 +38,7 @@ wait messages quit END_OF_DATA +scripts/check_for_zombie_jobs storage=File echo "ficheriro1.txt" >${cwd}/tmp/build/ficheriro1.txt echo "ficheriro2.txt" >${cwd}/tmp/build/ficheriro2.txt bin/bconsole -c bin/bconsole.conf <${cwd}/tmp/build/ficheriro2.txt bin/bconsole -c bin/bconsole.conf <&1 >/dev/null grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null bstat=$? diff --git a/regress/tests/etc-test-root b/regress/tests/etc-test-root index ee7634ef6f..59ec79755f 100755 --- a/regress/tests/etc-test-root +++ b/regress/tests/etc-test-root @@ -42,7 +42,10 @@ messages @# now do a restore @# @output tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select all +restore where=${cwd}/tmp/bacula-restores select +unmark * +mark * +done yes wait messages diff --git a/regress/tests/four-concurrent-jobs-tape b/regress/tests/four-concurrent-jobs-tape index 98d91a26e1..089f28696a 100755 --- a/regress/tests/four-concurrent-jobs-tape +++ b/regress/tests/four-concurrent-jobs-tape @@ -19,8 +19,7 @@ echo " === Starting four-concurrent-jobs-tape ===" echo " === Starting four-concurrent-jobs-tape ===" >>working/log echo " " -#bin/bacula start 2>&1 >/dev/null -bin/bacula start +bin/bacula start 2>&1 >/dev/null bin/bconsole -c bin/bconsole.conf <&1 >/dev/null grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null bstat=$? diff --git a/regress/tests/four-concurrent-jobs-test b/regress/tests/four-concurrent-jobs-test index abd55c631a..fbcf54798d 100755 --- a/regress/tests/four-concurrent-jobs-test +++ b/regress/tests/four-concurrent-jobs-test @@ -49,13 +49,17 @@ messages @# now do a restore @# @output tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select all storage=File1 +restore where=${cwd}/tmp/bacula-restores select storage=File1 +unmark * +mark * +done yes wait messages @output quit END_OF_DATA +scripts/check_for_zombie_jobs storage=File1 bin/bacula stop 2>&1 >/dev/null grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null diff --git a/regress/tests/four-jobs-tape b/regress/tests/four-jobs-tape index ee6d70fbf0..78ac24d78d 100755 --- a/regress/tests/four-jobs-tape +++ b/regress/tests/four-jobs-tape @@ -36,6 +36,7 @@ wait messages quit END_OF_DATA +scripts/check_for_zombie_jobs storage=DDS-4 echo "Backup 1 done" # make some files for the incremental to pick up touch ${cwd}/build/src/dird/*.c ${cwd}/build/src/dird/*.o @@ -53,6 +54,7 @@ wait messages quit END_OF_DATA +scripts/check_for_zombie_jobs storage=DDS-4 echo "Backup 2 done" touch ${cwd}/build/src/dird/*.c touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o @@ -68,6 +70,7 @@ wait messages quit END_OF_DATA +scripts/check_for_zombie_jobs storage=DDS-4 echo "Backup 3 done" # make some files for the incremental to pick up touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o @@ -83,6 +86,7 @@ wait messages quit END_OF_DATA +scripts/check_for_zombie_jobs storage=DDS-4 echo "Backup 4 done" # # now do several restores to ensure we cleanup between jobs @@ -96,7 +100,10 @@ restore where=${cwd}/tmp/bacula-restores select all yes wait @output tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select all +restore where=${cwd}/tmp/bacula-restores select +unmark * +mark * +done yes wait messages diff --git a/regress/tests/four-jobs-test b/regress/tests/four-jobs-test index 30f42fbca6..3299e33af8 100755 --- a/regress/tests/four-jobs-test +++ b/regress/tests/four-jobs-test @@ -35,6 +35,7 @@ wait messages quit END_OF_DATA +scripts/check_for_zombie_jobs storage=File echo "Backup 1 done" # make some files for the incremental to pick up touch ${cwd}/build/src/dird/*.c ${cwd}/build/src/dird/*.o @@ -53,6 +54,7 @@ wait messages quit END_OF_DATA +scripts/check_for_zombie_jobs storage=File echo "Backup 2 done" touch ${cwd}/build/src/dird/*.c touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o @@ -69,6 +71,7 @@ wait messages quit END_OF_DATA +scripts/check_for_zombie_jobs storage=File echo "Backup 3 done" # make some files for the incremental to pick up touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o @@ -85,6 +88,7 @@ wait messages quit END_OF_DATA +scripts/check_for_zombie_jobs storage=File echo "Backup 4 done" # # now do several restores to ensure we cleanup between jobs @@ -98,13 +102,17 @@ restore where=${cwd}/tmp/bacula-restores select all storage=File yes wait @output tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select all storage=File +restore where=${cwd}/tmp/bacula-restores select storage=File +unmark * +mark * +done yes wait messages @output quit END_OF_DATA +scripts/check_for_zombie_jobs storage=File bin/bacula stop 2>&1 >/dev/null grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null bstat=$? diff --git a/regress/tests/incremental-tape b/regress/tests/incremental-tape index 278766a36c..88b4d86980 100755 --- a/regress/tests/incremental-tape +++ b/regress/tests/incremental-tape @@ -40,6 +40,7 @@ wait messages quit END_OF_DATA +scripts/check_for_zombie_jobs storage=DDS-4 echo "ficheriro1.txt" >${cwd}/tmp/build/ficheriro1.txt echo "ficheriro2.txt" >${cwd}/tmp/build/ficheriro2.txt bin/bconsole -c bin/bconsole.conf <&1 >/dev/null grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null bstat=$? diff --git a/regress/tests/incremental-test b/regress/tests/incremental-test index 375d7dad77..af4b922e53 100755 --- a/regress/tests/incremental-test +++ b/regress/tests/incremental-test @@ -38,6 +38,7 @@ wait messages quit END_OF_DATA +scripts/check_for_zombie_jobs storage=File echo "ficheriro1.txt" >${cwd}/tmp/build/ficheriro1.txt echo "ficheriro2.txt" >${cwd}/tmp/build/ficheriro2.txt bin/bconsole -c bin/bconsole.conf <&1 >/dev/null grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null bstat=$? diff --git a/regress/tests/lib-test-root b/regress/tests/lib-test-root index 2b5aa81596..10b6710378 100755 --- a/regress/tests/lib-test-root +++ b/regress/tests/lib-test-root @@ -42,7 +42,10 @@ messages @# now do a restore @# @output tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select all +restore where=${cwd}/tmp/bacula-restores select +unmark * +mark * +done yes wait messages diff --git a/regress/tests/recycle-test b/regress/tests/recycle-test index f21171b8a4..d20ff409c6 100755 --- a/regress/tests/recycle-test +++ b/regress/tests/recycle-test @@ -66,13 +66,17 @@ list volumes @# now do a restore @# @output tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select all storage=File1 +restore where=${cwd}/tmp/bacula-restores select storage=File1 +unmark * +mark * +done yes wait messages @output quit END_OF_DATA +scripts/check_for_zombie_jobs storage=File1 bin/bacula stop 2>&1 >/dev/null grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null bstat=$? diff --git a/regress/tests/restore-by-file-tape b/regress/tests/restore-by-file-tape index f8dd658c3a..10959cdd3f 100755 --- a/regress/tests/restore-by-file-tape +++ b/regress/tests/restore-by-file-tape @@ -47,6 +47,7 @@ messages quit END_OF_DATA dstat=0 +scripts/check_for_zombie_jobs storage=DDS-4 # # We need to stop and start Bacula to # test appending to a previously written tape @@ -99,6 +100,7 @@ messages @output quit END_OF_DATA +scripts/check_for_zombie_jobs storage=DDS-4 bin/bacula stop 2>&1 >/dev/null for i in `cat ${cwd}/tmp/restore2-list`; do diff $i ${cwd}/tmp/bacula-restores$i diff --git a/regress/tests/restore-by-file-test b/regress/tests/restore-by-file-test index b120c6715d..a0263631f6 100755 --- a/regress/tests/restore-by-file-test +++ b/regress/tests/restore-by-file-test @@ -51,6 +51,7 @@ messages @output quit END_OF_DATA +scripts/check_for_zombie_jobs storage=File bin/bacula stop 2>&1 >/dev/null grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null bstat=$? diff --git a/regress/tests/restore-disk-seek-test b/regress/tests/restore-disk-seek-test index 8da375d4d5..0b110bbc25 100755 --- a/regress/tests/restore-disk-seek-test +++ b/regress/tests/restore-disk-seek-test @@ -68,6 +68,7 @@ messages @output quit END_OF_DATA +scripts/check_for_zombie_jobs storage=File bin/bacula stop 2>&1 >/dev/null # Now setup a control directory of only what we *should* restore rm -rf ${cwd}/tmp/build diff --git a/regress/tests/restore2-by-file-test b/regress/tests/restore2-by-file-test index acf8a457be..23570c1900 100755 --- a/regress/tests/restore2-by-file-test +++ b/regress/tests/restore2-by-file-test @@ -41,6 +41,7 @@ messages @output quit END_OF_DATA +scripts/check_for_zombie_jobs storage=File bin/bacula stop 2>&1 >/dev/null grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null bstat=$? diff --git a/regress/tests/six-vol-test b/regress/tests/six-vol-test index 4b076d198b..8beaeb8d67 100755 --- a/regress/tests/six-vol-test +++ b/regress/tests/six-vol-test @@ -41,13 +41,17 @@ messages @# now do a restore @# @output tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select all storage=File +restore where=${cwd}/tmp/bacula-restores select storage=File +unmark * +mark * +done yes wait messages @output quit END_OF_DATA +scripts/check_for_zombie_jobs storage=File bin/bacula stop 2>&1 >/dev/null grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null bstat=$? diff --git a/regress/tests/small-file-size-tape b/regress/tests/small-file-size-tape index 497b1b539f..1d63936c90 100755 --- a/regress/tests/small-file-size-tape +++ b/regress/tests/small-file-size-tape @@ -35,13 +35,17 @@ messages @# now do a restore @# @output tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 +restore where=${cwd}/tmp/bacula-restores select storage=DDS-4 +unmark * +mark * +done yes wait messages @output quit END_OF_DATA +scripts/check_for_zombie_jobs storage=DDS-4 bin/bacula stop 2>&1 >/dev/null grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null bstat=$? diff --git a/regress/tests/span-vol-test b/regress/tests/span-vol-test index 36d52e0148..6e1682efe6 100755 --- a/regress/tests/span-vol-test +++ b/regress/tests/span-vol-test @@ -42,13 +42,17 @@ messages @# now do a restore @# @output tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select all storage=File1 +restore where=${cwd}/tmp/bacula-restores select storage=File1 +unmark * +mark * +done yes wait messages @output quit END_OF_DATA +scripts/check_for_zombie_jobs storage=File1 bin/bacula stop 2>&1 >/dev/null grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null bstat=$? diff --git a/regress/tests/sparse-compressed-test b/regress/tests/sparse-compressed-test index 1c28061a71..7eacbb2daa 100755 --- a/regress/tests/sparse-compressed-test +++ b/regress/tests/sparse-compressed-test @@ -40,6 +40,7 @@ messages @output quit END_OF_DATA +scripts/check_for_zombie_jobs storage=File bin/bacula stop 2>&1 >/dev/null grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null bstat=$? diff --git a/regress/tests/sparse-test b/regress/tests/sparse-test index ca44e623f1..b040af0244 100755 --- a/regress/tests/sparse-test +++ b/regress/tests/sparse-test @@ -33,13 +33,17 @@ messages @# now do a restore @# @output tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select all storage=File +restore where=${cwd}/tmp/bacula-restores select storage=File +unmark * +mark * +done yes wait messages @output quit END_OF_DATA +scripts/check_for_zombie_jobs storage=File bin/bacula stop 2>&1 >/dev/null grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null bstat=$? diff --git a/regress/tests/two-jobs-test b/regress/tests/two-jobs-test index 13c6a6297e..6bd84cb750 100755 --- a/regress/tests/two-jobs-test +++ b/regress/tests/two-jobs-test @@ -22,6 +22,9 @@ echo " " bin/bacula start 2>&1 >/dev/null bin/bconsole -c bin/bconsole.conf <&1 >/dev/null grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null bstat=$? diff --git a/regress/tests/two-vol-test b/regress/tests/two-vol-test index 3149a628ce..e58847b2f1 100755 --- a/regress/tests/two-vol-test +++ b/regress/tests/two-vol-test @@ -42,6 +42,7 @@ messages @output quit END_OF_DATA +scripts/check_for_zombie_jobs storage=File1 bin/bacula stop 2>&1 >/dev/null grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null bstat=$? diff --git a/regress/tests/two-volume-tape b/regress/tests/two-volume-tape index a212dc3748..9494de717a 100755 --- a/regress/tests/two-volume-tape +++ b/regress/tests/two-volume-tape @@ -46,6 +46,7 @@ messages @output quit END_OF_DATA +scripts/check_for_zombie_jobs storage=DDS-4 bin/bacula stop 2>&1 >/dev/null grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null bstat=$? diff --git a/regress/tests/verify-vol-test b/regress/tests/verify-vol-test index 7f4913b93e..eea92ce232 100755 --- a/regress/tests/verify-vol-test +++ b/regress/tests/verify-vol-test @@ -41,6 +41,7 @@ messages quit END_OF_DATA sleep 2 +scripts/check_for_zombie_jobs storage=File bin/bacula stop 2>&1 >/dev/null grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null bstat=$? diff --git a/regress/tests/weird-files-test b/regress/tests/weird-files-test index 387fa3763e..6eb4614ab8 100755 --- a/regress/tests/weird-files-test +++ b/regress/tests/weird-files-test @@ -11,7 +11,14 @@ fi cwd=`pwd` scripts/copy-test-confs scripts/cleanup +# +# Note, we save the weird-files directory twice on purpose +# because this causes problems with hard linked files +# that are only saved once. In 1.33, Bacula now deals +# with this situation. +# echo "${cwd}/weird-files" >/tmp/file-list +echo "${cwd}/weird-files" >>/tmp/file-list bin/bacula stop 2>&1 >/dev/null cd bin ./drop_bacula_tables >/dev/null 2>&1 @@ -25,7 +32,8 @@ echo " === Starting weird filenames test ===" echo " === Starting weird filenames test ===" >>working/log echo " " -bin/bacula start 2>&1 >/dev/null +# bin/bacula start 2>&1 >/dev/null +bin/bacula start bin/bconsole -c bin/bconsole.conf <&1 >/dev/null -${cwd}/bin/testls weird-files >${cwd}/tmp/original +${cwd}/bin/testls weird-files | sort >${cwd}/tmp/original cd tmp/bacula-restores${cwd} -${cwd}/bin/testls weird-files >${cwd}/tmp/restored +${cwd}/bin/testls weird-files | sort >${cwd}/tmp/restored cd ${cwd} grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null bstat=$? diff --git a/regress/tests/weird-files2-test b/regress/tests/weird-files2-test index 755525c346..e44bcb6c6d 100755 --- a/regress/tests/weird-files2-test +++ b/regress/tests/weird-files2-test @@ -40,6 +40,7 @@ messages @output quit END_OF_DATA +scripts/check_for_zombie_jobs storage=File # # Now mess up the a hard link, and a soft link # @@ -58,6 +59,8 @@ messages @output tmp/log2.out restore where= storage=File 5 +unmark * +mark * done yes wait @@ -65,6 +68,7 @@ messages @output quit END_OF_DATA +scripts/check_for_zombie_jobs storage=File bin/bacula stop 2>&1 >/dev/null bin/testls weird-files2 >${cwd}/tmp/restored grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null diff --git a/regress/weird-files.tar.gz b/regress/weird-files.tar.gz index 0ecbe3fc72..d1b3a21226 100644 Binary files a/regress/weird-files.tar.gz and b/regress/weird-files.tar.gz differ