From 8acf487737013dab54413bb21c953db1f0a20afd Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Thu, 10 Nov 2005 08:30:24 +0000 Subject: [PATCH] Update git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2565 91ce42f0-d328-0410-95d8-f526ca767f89 --- regress/scripts/bacula-dir-win32-tape.conf | 145 ------------------ regress/scripts/copy-win32-confs | 4 +- regress/scripts/do_sed | 2 +- regress/scripts/setup | 8 +- ....conf.in => win32-bacula-dir-tape.conf.in} | 10 +- regress/scripts/win32-bacula-sd-tape.conf | 54 +++++++ regress/tests/backup-win32-tape | 56 ------- regress/tests/win32-backup-tape | 72 +++++++++ 8 files changed, 139 insertions(+), 212 deletions(-) delete mode 100644 regress/scripts/bacula-dir-win32-tape.conf rename regress/scripts/{bacula-dir-win32-tape.conf.in => win32-bacula-dir-tape.conf.in} (94%) create mode 100644 regress/scripts/win32-bacula-sd-tape.conf delete mode 100755 regress/tests/backup-win32-tape create mode 100755 regress/tests/win32-backup-tape diff --git a/regress/scripts/bacula-dir-win32-tape.conf b/regress/scripts/bacula-dir-win32-tape.conf deleted file mode 100644 index b9d3cf2c81..0000000000 --- a/regress/scripts/bacula-dir-win32-tape.conf +++ /dev/null @@ -1,145 +0,0 @@ -# -# Default Bacula Director Configuration file -# -# The only thing that MUST be changed is to add one or more -# file or directory names in the Include directive of the -# FileSet resource. -# -# For Bacula release 1.33 -# -# You might also want to change the default email address -# from root to your address. See the "mail" and "operator" -# directives in the Messages resource. -# - -Director { # define myself - Name = localhost-dir - DIRport = 8101 # where we listen for UA connections - QueryFile = "/home/kern/bacula/regress/bin/query.sql" - WorkingDirectory = "/home/kern/bacula/regress/working" - PidDirectory = "/home/kern/bacula/regress/working" - Maximum Concurrent Jobs = 4 - Password = "pNvX1WiXnwv2C/F7E52LGvw6rKjbbPvu2kyuPa9pVaL3" - Messages = Daemon -} - -# -# Define the main nightly save backup job -# By default, this job will back up to disk in /tmp -Job { - Name = "NightlySave" - Type = Backup - Client=Tibs - FileSet="Full Set" - Storage = DDS-4 - Messages = Standard - Pool = Default - Write Bootstrap = "/home/kern/bacula/regress/working/NightlySave.bsr" - Maximum Concurrent Jobs = 4 - SpoolData = yes -} - - -# Standard Restore template, to be changed by Console program -Job { - Name = "RestoreFiles" - Type = Restore - Client=Tibs - FileSet="Full Set" - Storage = DDS-4 - Messages = Standard - Pool = Default - Where = /tmp/bacula-restores -} - - -# List of files to be backed up -FileSet { - Name = "Full Set" - Enable VSS = yes - Include { Options { signature=MD5 } - File = "c:" - } -} - - -# -# When to do the backups, full backup on first sunday of the month, -# differential (i.e. incremental since full) every other sunday, -# and incremental backups other days -Schedule { - Name = "WeeklyCycle" - Run = Full 1st sun at 1:05 - Run = Differential 2nd-5th sun at 1:05 - Run = Incremental mon-sat at 1:05 -} - -# Client (File Services) to backup -Client { - Name = Tibs - Address = tibs - FDPort = 9102 - Catalog = MyCatalog - Password = "xBzFq+a9llZyGyfMaNO9e3outP86/1AUAT8P34RoT62G" - 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 - Address = 192.168.68.112 # N.B. Use a fully qualified name here - SDPort = 8103 - Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9" # password for Storage daemon - Device = DDS-4 # must be same as Device in Storage daemon - Media Type = DDS-4 # must be same as MediaType in Storage daemon - AutoChanger = yes - Maximum Concurrent Jobs = 4 -} - - -# Generic catalog service -Catalog { - Name = MyCatalog - dbname = bacula; user = bacula; password = "" -} - -# Reasonable message delivery -- send most everything to email address -# and to the console -Messages { - Name = Standard - mailcommand = "/home/kern/bacula/regress/bin/bsmtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: %t %e of %c %l\" %r" - operatorcommand = "/home/kern/bacula/regress/bin/bsmtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: Intervention needed for %j\" %r" - MailOnError = kern@sibbald.com = all, !terminate - operator = kern@sibbald.com = mount - console = all, !skipped, !terminate, !restored -# -# WARNING! the following will create a file that you must cycle from -# time to time as it will grow indefinitely. However, it will -# also keep all your messages if the scroll off the console. -# - append = "/home/kern/bacula/regress/working/log" = all, !skipped -} - -# -# Message delivery for daemon messages (no job). -Messages { - Name = Daemon - mailcommand = "/home/kern/bacula/regress/bin/bsmtp -h localhost -f \"\(Bacula\) %r\" -s \"Bacula daemon message\" %r" - mail = kern@sibbald.com = all, !skipped - console = all, !skipped, !saved - append = "/home/kern/bacula/regress/working/log" = all, !skipped -} - - -# Default pool definition -Pool { - Name = Default - Pool Type = Backup - Recycle = yes # Bacula can automatically recycle Volumes - AutoPrune = yes # Prune expired volumes - Volume Retention = 365d # one year - Accept Any Volume = yes # write on any volume in the pool -} diff --git a/regress/scripts/copy-win32-confs b/regress/scripts/copy-win32-confs index b221565313..e301ef9ee4 100755 --- a/regress/scripts/copy-win32-confs +++ b/regress/scripts/copy-win32-confs @@ -1,6 +1,6 @@ #!/bin/sh -/bin/cp -f scripts/bacula-dir-win32-tape.conf bin/bacula-dir.conf -/bin/cp -f scripts/bacula-sd-tape.conf bin/bacula-sd.conf +/bin/cp -f scripts/win32-bacula-dir-tape.conf bin/bacula-dir.conf +/bin/cp -f scripts/win32-bacula-sd-tape.conf bin/bacula-sd.conf /bin/cp -f scripts/test-bacula-fd.conf bin/bacula-fd.conf /bin/cp -f scripts/test-console.conf bin/bconsole.conf touch bin/tape_options diff --git a/regress/scripts/do_sed b/regress/scripts/do_sed index 2f5791cf81..3315e38e29 100755 --- a/regress/scripts/do_sed +++ b/regress/scripts/do_sed @@ -39,7 +39,7 @@ sed -f ${out} ${cwd}/scripts/test-bacula-fd.conf.in >${cwd}/scripts/test-bacula- sed -f ${out} ${cwd}/scripts/test-bacula-sd.conf.in >${cwd}/scripts/test-bacula-sd.conf sed -f ${out} ${cwd}/scripts/test-console.conf.in >${cwd}/scripts/test-console.conf sed -f ${out} ${cwd}/scripts/bacula-dir-tape.conf.in >${cwd}/scripts/bacula-dir-tape.conf -sed -f ${out} ${cwd}/scripts/bacula-dir-win32-tape.conf.in >${cwd}/scripts/bacula-dir-win32-tape.conf +sed -f ${out} ${cwd}/scripts/win32-bacula-dir-tape.conf.in >${cwd}/scripts/win32-bacula-dir-tape.conf sed -f ${out} ${cwd}/scripts/bacula-sd-tape.conf.in >${cwd}/scripts/bacula-sd-tape.conf sed -f ${out} ${cwd}/scripts/bacula-sd-2tape.conf.in >${cwd}/scripts/bacula-sd-2tape.conf sed -f ${out} ${cwd}/scripts/bacula-sd-2drive.conf.in >${cwd}/scripts/bacula-sd-2drive.conf diff --git a/regress/scripts/setup b/regress/scripts/setup index 66b3634aca..7da3782695 100755 --- a/regress/scripts/setup +++ b/regress/scripts/setup @@ -30,10 +30,10 @@ cp src/tools/testls ../bin cd .. bin/bacula stop cd bin -./create_bacula_database -./drop_bacula_tables -./make_bacula_tables -./grant_bacula_privileges +./create_bacula_database bacula +./drop_bacula_tables bacula +./make_bacula_tables bacula +./grant_bacula_privileges bacula cd .. # Start and stop Bacula to ensure conf files are OK bin/bacula start diff --git a/regress/scripts/bacula-dir-win32-tape.conf.in b/regress/scripts/win32-bacula-dir-tape.conf.in similarity index 94% rename from regress/scripts/bacula-dir-win32-tape.conf.in rename to regress/scripts/win32-bacula-dir-tape.conf.in index 919edc4869..4f84e18190 100644 --- a/regress/scripts/bacula-dir-win32-tape.conf.in +++ b/regress/scripts/win32-bacula-dir-tape.conf.in @@ -13,7 +13,7 @@ # Director { # define myself - Name = @hostname@-dir + Name = rufus-dir DIRport = 8101 # where we listen for UA connections QueryFile = "@scriptdir@/query.sql" WorkingDirectory = "@working_dir@" @@ -57,8 +57,10 @@ Job { FileSet { Name = "Full Set" Enable VSS = yes - Include { Options { signature=MD5 } - File = "c:" + Include { Options { signature=MD5; portable=no + compression=GZIP } +# File = "c:/cygwin" # big + File = "c:/cygwin/home/kern/bacula/k" } } @@ -80,7 +82,7 @@ Client { Address = tibs FDPort = 9102 Catalog = MyCatalog - Password = "xBzFq+a9llZyGyfMaNO9e3outP86/1AUAT8P34RoT62G" + Password = "pNvX1WiXnwv2C/F7E52LGvw6rKjbbPvu2kyuPa9pVaL3" File Retention = 30d # 30 days Job Retention = 180d # six months AutoPrune = yes # Prune expired Jobs/Files diff --git a/regress/scripts/win32-bacula-sd-tape.conf b/regress/scripts/win32-bacula-sd-tape.conf new file mode 100644 index 0000000000..8589d67629 --- /dev/null +++ b/regress/scripts/win32-bacula-sd-tape.conf @@ -0,0 +1,54 @@ +# +# Default Bacula Storage Daemon Configuration file +# +# For Bacula release 1.33 +# +# You may need to change the name of your tape drive +# on the "Archive Device" directive in the Device +# resource. If you change the Name and/or the +# "Media Type" in the Device resource, please ensure +# that dird.conf has corresponding changes. +# + +Storage { # definition of myself + Name = localhost-sd + SDPort = 8103 # Director's port + WorkingDirectory = "/home/kern/bacula/regress/working" + Pid Directory = "/home/kern/bacula/regress/working" + Subsys Directory = "/home/kern/bacula/regress/working" +} + +# +# List Directors who are permitted to contact Storage daemon +# +Director { + Name = rufus-dir + Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9" +} + +# +# Devices supported by this Storage daemon +# To connect, the Director's bacula-dir.conf must have the +# same Name and MediaType. +# + +Device { + Name = DDS-4 # + Media Type = DDS-4 + Archive Device = /dev/nst0 + AutomaticMount = yes; # when device opened, read it + AlwaysOpen = yes; + RemovableMedia = yes; + @/home/kern/bacula/regress/bin/tape_options +# Maximum File Size = 1000000 +# MaximumVolumeSize = 100M +} + +# +# Send all messages to the Director, +# mount messages also are sent to the email address +# +Messages { + Name = Standard + director = rufus-dir = all, !terminate +} diff --git a/regress/tests/backup-win32-tape b/regress/tests/backup-win32-tape deleted file mode 100755 index 3723b536dd..0000000000 --- a/regress/tests/backup-win32-tape +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory -# to a tape then restore it, we do that twice to ensure that -# we can correctly append to a tape. -# -cwd=`pwd` -scripts/copy-win32-confs -scripts/cleanup-tape - -echo "${cwd}/build" >/tmp/file-list - -echo " " -echo " " -echo " === Starting Backup Win32 tape test at `date +%R:%S` ===" -echo " === Starting Backup Win32 tape test at `date +%R:%S` ===" >>working/log -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=$? -if [ $bstat != 0 ] ; then - echo " " - echo " " - echo " !!!!! Backup Win32 tape test failed!!! !!!!! " - echo " !!!!! Backup Win32 tape test failed!!! !!!!! " >>test.out - echo " " -else - echo " ===== Backup Win32 tape test OK ===== " - echo " ===== Backup Win32 tape test OK ===== " >>test.out - scripts/cleanup -fi diff --git a/regress/tests/win32-backup-tape b/regress/tests/win32-backup-tape new file mode 100755 index 0000000000..f51252e8b0 --- /dev/null +++ b/regress/tests/win32-backup-tape @@ -0,0 +1,72 @@ +#!/bin/sh +# +# Run a simple backup of the Bacula build directory +# to a tape then restore it, we do that twice to ensure that +# we can correctly append to a tape. +# +debug=1 +if test "$debug" -eq 1 ; then + out="tee" +else + out="output" +fi + +cwd=`pwd` +scripts/copy-win32-confs +scripts/cleanup-tape + +echo "${cwd}/build" >/tmp/file-list + +echo " " +echo " " +echo " === Starting Win32 Backup tape test at `date +%R:%S` ===" +echo " === Starting Win32 Backup tape test at `date +%R:%S` ===" >>working/log +echo " " + +cat <tmp/bconcmds +@output /dev/null +messages +@$out tmp/log1.out +label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default drive=0 +run job=NightlySave yes +@sleep 10 +status storage=DDS-4 +@sleep 30 +messages +wait +messages +@# +@# now do a restore +@# +@$out tmp/log2.out +restore where=c:/tmp/bacula-restores select all storage=DDS-4 done +yes +wait +messages +END_OF_DATA +if test "$debug" -eq 1 ; then + bin/bacula start + cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf +else + bin/bacula start 2>&1 >/dev/null + cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf 2>&1 >/dev/null +fi + +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=$? +grep "^ Termination: *Restore OK" tmp/log2.out 2>&1 >/dev/null +rstat=$? +if [ $bstat != 0 -o $rstat != 0 ] ; then + echo " " + echo " " + echo " !!!!! Win32 Backup tape test failed!!! !!!!! " + echo " !!!!! Win32 Backup tape test failed!!! !!!!! " >>test.out + echo " " +else + echo " ===== Win32 Backup tape test OK ===== " + echo " ===== Win32 Backup tape test OK ===== " >>test.out + scripts/cleanup +fi -- 2.39.5