From: Kern Sibbald Date: Wed, 2 Sep 2009 09:58:07 +0000 (+0200) Subject: Eliminate DDS-4 in favor of tape + create btape-test-changer test X-Git-Tag: Release-5.0.0~319^2 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=654ac470dfe7258bffc7d989f00e2d4f990a0e23;p=bacula%2Fbacula Eliminate DDS-4 in favor of tape + create btape-test-changer test --- diff --git a/regress/full-tape-tests b/regress/full-tape-tests index c30624dccc..378b214e6d 100755 --- a/regress/full-tape-tests +++ b/regress/full-tape-tests @@ -1,6 +1,6 @@ #!/bin/sh # -# Run full tape tests +# Run full tape tests assumes you have an autochanger # . ./config @@ -14,8 +14,10 @@ if test ! x$AUTOCHANGER = x/dev/null ; then fi echo " " echo " " >>test.out -echo "Start all non-root tape tests" -echo "Start all non-root tape tests" >>test.out +echo "Start full tape tests" +echo "Start full tape tests" >>test.out + +# Non-autochanger tests nice tests/ansi-label-tape nice tests/backup-bacula-tape nice tests/bscan-tape @@ -34,6 +36,14 @@ nice tests/small-file-size-tape nice tests/truncate-bug-tape nice tests/verify-vol-tape +# Autochanger tests +nice tests/2drive-incremental-changer +nice tests/bad-label-changer +nice tests/incremental-changer +nice tests/two-pool-changer +nice tests/two-volume-changer +nice tests/vol-duration-changer + # very long # nice tests/btape-fill-full-tape diff --git a/regress/scripts/ansi-sd-tape.conf.in b/regress/scripts/ansi-sd-tape.conf.in index 5993e12456..cf35cef730 100644 --- a/regress/scripts/ansi-sd-tape.conf.in +++ b/regress/scripts/ansi-sd-tape.conf.in @@ -33,8 +33,8 @@ Director { # Device { - Name = DDS-4 # - Media Type = DDS-4 + Name = tape # + Media Type = tape Archive Device = @tape_drive@ AutomaticMount = yes; # when device opened, read it AlwaysOpen = yes; diff --git a/regress/scripts/bacula-dir-2client.conf.in b/regress/scripts/bacula-dir-2client.conf.in index 06e529e88b..daf7eeef57 100644 --- a/regress/scripts/bacula-dir-2client.conf.in +++ b/regress/scripts/bacula-dir-2client.conf.in @@ -32,7 +32,7 @@ Job { Type = Backup Client=@hostname@-fd FileSet="Full Set" - Storage = DDS-4 + Storage = tape Messages = Standard Pool = Default Write Bootstrap = "@working_dir@/NightlySave.bsr" @@ -50,7 +50,7 @@ Job { Type = Backup Client=@hostname@-fd1 FileSet="Full Set" - Storage = DDS-4 + Storage = tape Messages = Standard Pool = Default Write Bootstrap = "@working_dir@/NightlySave.bsr" @@ -65,7 +65,7 @@ Job { Type = Backup Client=@hostname@-fd FileSet="Full Set" - Storage = DDS-4 + Storage = tape Messages = Standard Pool = Default Write Bootstrap = "@working_dir@/NightlySave.bsr" @@ -80,7 +80,7 @@ Job { Type = Backup Client=@hostname@-fd FileSet="Full Set" - Storage = DDS-4 + Storage = tape Messages = Standard Pool = Default Write Bootstrap = "@working_dir@/NightlySave.bsr" @@ -95,7 +95,7 @@ Job { Level = VolumeToCatalog Client=@hostname@-fd FileSet="Verify Set" - Storage = DDS-4 + Storage = tape Messages = Standard Pool = Default Write Bootstrap = "@working_dir@/NightlySave.bsr" @@ -126,7 +126,7 @@ Job { Type = Restore Client=@hostname@-fd FileSet="Full Set" - Storage = DDS-4 + Storage = tape Messages = Standard Pool = Default Where = @tmpdir@/bacula-restores @@ -193,12 +193,12 @@ Client { # Definition of DDS tape storage device Storage { - Name = DDS-4 + Name = tape Address = @hostname@ # N.B. Use a fully qualified name here SDPort = @sdport@ 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 + Device = tape # must be same as Device in Storage daemon + Media Type = tape # must be same as MediaType in Storage daemon Maximum Concurrent Jobs = 4 # Autochanger = yes } diff --git a/regress/scripts/bacula-dir-2d.conf.in b/regress/scripts/bacula-dir-2d.conf.in index 515bec1a29..6ca86448b1 100644 --- a/regress/scripts/bacula-dir-2d.conf.in +++ b/regress/scripts/bacula-dir-2d.conf.in @@ -30,7 +30,7 @@ Job { Type = Backup Client=@hostname@-fd FileSet="Full Set" - Storage = DDS-4 + Storage = tape Messages = Standard Pool = Default Write Bootstrap = "@working_dir@/NightlySave.bsr" @@ -45,7 +45,7 @@ Job { Type = Restore Client=@hostname@-fd FileSet="Full Set" - Storage = DDS-4 + Storage = tape Messages = Standard Pool = Default Where = @tmpdir@/bacula-restores @@ -87,12 +87,12 @@ Client { # Definition of DDS tape storage device Storage { - Name = DDS-4 + Name = tape Address = @hostname@ # N.B. Use a fully qualified name here SDPort = @sdport@ Password = "storage-pw" - Device = DDS-4 # must be same as Device in Storage daemon - Media Type = DDS-4 # must be same as MediaType in Storage daemon + Device = tape # must be same as Device in Storage daemon + Media Type = tape # must be same as MediaType in Storage daemon Maximum Concurrent Jobs = 4 Autochanger = yes } diff --git a/regress/scripts/bacula-dir-tape.conf.in b/regress/scripts/bacula-dir-tape.conf.in index df9daba164..5e00893ba7 100644 --- a/regress/scripts/bacula-dir-tape.conf.in +++ b/regress/scripts/bacula-dir-tape.conf.in @@ -32,7 +32,7 @@ Job { Type = Backup Client = @hostname@-fd FileSet="Full Set" - Storage = DDS-4 + Storage = tape Messages = Standard Pool = Default Write Bootstrap = "@working_dir@/NightlySave.bsr" @@ -47,7 +47,7 @@ Job { Type = Backup Client = @hostname@-fd FileSet="Full Set" - Storage = DDS-4 + Storage = tape Messages = Standard Pool = Default Write Bootstrap = "@working_dir@/NightlySave.bsr" @@ -62,7 +62,7 @@ Job { Type = Backup Client=@hostname@-fd FileSet="Full Set" - Storage = DDS-4 + Storage = tape Messages = Standard Pool = Default Write Bootstrap = "@working_dir@/NightlySave.bsr" @@ -77,7 +77,7 @@ Job { Level = VolumeToCatalog Client=@hostname@-fd FileSet="Verify Set" - Storage = DDS-4 + Storage = tape Messages = Standard Pool = Default Write Bootstrap = "@working_dir@/NightlySave.bsr" @@ -108,7 +108,7 @@ Job { Type = Restore Client=@hostname@-fd FileSet="Full Set" - Storage = DDS-4 + Storage = tape Messages = Standard Pool = Default Where = @tmpdir@/bacula-restores @@ -162,12 +162,12 @@ Client { # Definition of DDS tape storage device Storage { - Name = DDS-4 + Name = tape Address = @hostname@ # N.B. Use a fully qualified name here SDPort = @sdport@ 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 + Device = tape # must be same as Device in Storage daemon + Media Type = tape # must be same as MediaType in Storage daemon Maximum Concurrent Jobs = 100 # Autochanger = yes } diff --git a/regress/scripts/bacula-dir-win32-tape.conf.in b/regress/scripts/bacula-dir-win32-tape.conf.in index 9216618847..e0fa99c47f 100644 --- a/regress/scripts/bacula-dir-win32-tape.conf.in +++ b/regress/scripts/bacula-dir-win32-tape.conf.in @@ -31,7 +31,7 @@ Job { Type = Backup Client=@win32_client@ FileSet="Full Set" - Storage = DDS-4 + Storage = tape Messages = Standard Pool = Default Write Bootstrap = "@working_dir@/NightlySave.bsr" @@ -46,7 +46,7 @@ Job { Type = Restore Client=@win32_client@ FileSet="Full Set" - Storage = DDS-4 + Storage = tape Messages = Standard Pool = Default Where = @tmpdir@/bacula-restores @@ -89,12 +89,12 @@ Client { # Definition of DDS tape storage device Storage { - Name = DDS-4 + Name = tape Address = @hostname@-sd # N.B. Use a fully qualified name here SDPort = @sdport@ 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 + Device = tape # must be same as Device in Storage daemon + Media Type = tape # must be same as MediaType in Storage daemon AutoChanger = yes Maximum Concurrent Jobs = 4 } diff --git a/regress/scripts/bacula-sd-2d.conf.in b/regress/scripts/bacula-sd-2d.conf.in index bb80a48ebb..a6f23b70c5 100644 --- a/regress/scripts/bacula-sd-2d.conf.in +++ b/regress/scripts/bacula-sd-2d.conf.in @@ -29,7 +29,7 @@ Director { # same Name and MediaType. # Autochanger { - Name = DDS-4 + Name = tape Changer Device = @autochanger@ Changer Command ="@scriptdir@/@changer_script@ %c %o %S %a %d" Device = Drive-0 @@ -37,7 +37,7 @@ Autochanger { Device { Name = Drive-0 - Media Type = DDS-4 + Media Type = tape Archive Device = @tape_drive@ AutomaticMount = yes; # when device opened, read it Autochanger = yes diff --git a/regress/scripts/bacula-sd-2disk-drive.conf.in b/regress/scripts/bacula-sd-2disk-drive.conf.in index 00f88325fd..2d32e1822d 100644 --- a/regress/scripts/bacula-sd-2disk-drive.conf.in +++ b/regress/scripts/bacula-sd-2disk-drive.conf.in @@ -33,7 +33,7 @@ Director { # same Name and MediaType. # Autochanger { - Name = DDS-4 + Name = tape Changer Device = @disk_drive@/conf Changer Command ="@scriptdir@/disk-changer %c %o %S %a %d" Device = Drive-0, Drive-1 @@ -42,7 +42,7 @@ Autochanger { Device { Name = Drive-0 Device Type = File - Media Type = DDS-4 + Media Type = tape Archive Device = @disk_drive@/drive0 AutomaticMount = yes; # when device opened, read it Autochanger = yes @@ -55,7 +55,7 @@ Device { Device { Name = Drive-1 Device Type = File - Media Type = DDS-4 + Media Type = tape Archive Device = @disk_drive@/drive1 AutomaticMount = yes; # when device opened, read it Autochanger = yes diff --git a/regress/scripts/bacula-sd-2disk.conf.in b/regress/scripts/bacula-sd-2disk.conf.in index 0c5b5d9777..f63d3e3ce3 100644 --- a/regress/scripts/bacula-sd-2disk.conf.in +++ b/regress/scripts/bacula-sd-2disk.conf.in @@ -32,7 +32,7 @@ Director { # same Name and MediaType. # Autochanger { - Name = DDS-4 + Name = tape Changer Device = @disk_drive@/conf Changer Command ="@scriptdir@/disk-changer %c %o %S %a %d" Device = Drive-0, Drive-1 @@ -41,7 +41,7 @@ Autochanger { Device { Name = Drive-0 # Device Type = File - Media Type = DDS-4 + Media Type = tape Archive Device = @disk_drive@/drive0 AutomaticMount = yes; # when device opened, read it Autochanger = yes @@ -54,7 +54,7 @@ Device { Device { Name = Drive-1 # Device Type = File - Media Type = DDS-4 + Media Type = tape Archive Device = @disk_drive@/drive1 AutomaticMount = yes; # when device opened, read it Autochanger = yes diff --git a/regress/scripts/bacula-sd-2drive.conf.in b/regress/scripts/bacula-sd-2drive.conf.in index 12d2e8d6c7..b602e35be3 100644 --- a/regress/scripts/bacula-sd-2drive.conf.in +++ b/regress/scripts/bacula-sd-2drive.conf.in @@ -32,7 +32,7 @@ Director { # same Name and MediaType. # Autochanger { - Name = DDS-4 + Name = tape Changer Device = @autochanger@ Changer Command ="@scriptdir@/@changer_script@ %c %o %S %a %d" Device = Drive-0, Drive-1 @@ -40,7 +40,7 @@ Autochanger { Device { Name = Drive-0 - Media Type = DDS-4 + Media Type = tape Archive Device = @tape_drive@ AutomaticMount = yes; # when device opened, read it Autochanger = yes @@ -53,7 +53,7 @@ Device { Device { Name = Drive-1 - Media Type = DDS-4 + Media Type = tape Archive Device = @tape_drive1@ AutomaticMount = yes; # when device opened, read it Autochanger = yes diff --git a/regress/scripts/bacula-sd-2tape.conf.in b/regress/scripts/bacula-sd-2tape.conf.in index 07a50c4085..94f641a40b 100644 --- a/regress/scripts/bacula-sd-2tape.conf.in +++ b/regress/scripts/bacula-sd-2tape.conf.in @@ -32,7 +32,7 @@ Director { # same Name and MediaType. # Autochanger { - Name = DDS-4 + Name = tape Changer Device = @autochanger@ Changer Command ="@scriptdir@/@changer_script@ %c %o %S %a %d" Device = Drive-0 @@ -40,7 +40,7 @@ Autochanger { Device { Name = Drive-0 # - Media Type = DDS-4 + Media Type = tape Archive Device = @tape_drive@ AutomaticMount = yes; # when device opened, read it Autochanger = yes diff --git a/regress/scripts/bacula-sd-tape.conf.in b/regress/scripts/bacula-sd-tape.conf.in index f6a3ca5c80..eee268f7e4 100644 --- a/regress/scripts/bacula-sd-tape.conf.in +++ b/regress/scripts/bacula-sd-tape.conf.in @@ -34,8 +34,8 @@ Director { # Device { - Name = DDS-4 # - Media Type = DDS-4 + Name = tape # + Media Type = tape Archive Device = @tape_drive@ AutomaticMount = yes; # when device opened, read it AlwaysOpen = yes; diff --git a/regress/scripts/bacula-sd.conf.in b/regress/scripts/bacula-sd.conf.in index 025400c2b1..6177155957 100644 --- a/regress/scripts/bacula-sd.conf.in +++ b/regress/scripts/bacula-sd.conf.in @@ -43,8 +43,8 @@ Device { } #Device { -# Name = DDS-4 # -# Media Type = DDS-4 +# Name = tape # +# Media Type = tape # Archive Device = /dev/nst0 # AutomaticMount = yes; # when device opened, read it # AlwaysOpen = yes; diff --git a/regress/scripts/functions b/regress/scripts/functions index 1ed46830d6..845a3903cf 100644 --- a/regress/scripts/functions +++ b/regress/scripts/functions @@ -183,9 +183,9 @@ run_bconsole() run_btape() { if test "$debug" -eq 1 ; then - cat ${tmp}/bconcmds | ${bin}/btape -c ${conf}/bacula-sd.conf DDS-4 | tee ${tmp}/log1.out + cat ${tmp}/bconcmds | ${bin}/btape -c ${conf}/bacula-sd.conf tape | tee ${tmp}/log1.out else - cat ${tmp}/bconcmds | ${bin}/btape -c ${conf}/bacula-sd.conf DDS-4 >${tmp}/log1.out 2>&1 + cat ${tmp}/bconcmds | ${bin}/btape -c ${conf}/bacula-sd.conf tape >${tmp}/log1.out 2>&1 fi } diff --git a/regress/scripts/new-test-bacula-dir.conf.in b/regress/scripts/new-test-bacula-dir.conf.in index 774eaf3c33..1d08f64e8e 100644 --- a/regress/scripts/new-test-bacula-dir.conf.in +++ b/regress/scripts/new-test-bacula-dir.conf.in @@ -425,7 +425,7 @@ Storage { # SDPort = @sdport@ # Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9" # password for Storage daemon # Device = SDT-10000 # must be same as Device in Storage daemon -# Media Type = DDS-4 # must be same as MediaType in Storage daemon +# Media Type = tape # must be same as MediaType in Storage daemon #} # Definition of 8mm tape storage device diff --git a/regress/scripts/plugin-test-bacula-dir.conf.in b/regress/scripts/plugin-test-bacula-dir.conf.in index dc30fed24e..19eb090402 100644 --- a/regress/scripts/plugin-test-bacula-dir.conf.in +++ b/regress/scripts/plugin-test-bacula-dir.conf.in @@ -425,7 +425,7 @@ Storage { # SDPort = @sdport@ # Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9" # password for Storage daemon # Device = SDT-10000 # must be same as Device in Storage daemon -# Media Type = DDS-4 # must be same as MediaType in Storage daemon +# Media Type = tape # must be same as MediaType in Storage daemon #} # Definition of 8mm tape storage device diff --git a/regress/scripts/test-bacula-dir.conf.in b/regress/scripts/test-bacula-dir.conf.in index 1bb046c398..531deb963f 100644 --- a/regress/scripts/test-bacula-dir.conf.in +++ b/regress/scripts/test-bacula-dir.conf.in @@ -243,7 +243,7 @@ Storage { # SDPort = @sdport@ # Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9" # password for Storage daemon # Device = SDT-10000 # must be same as Device in Storage daemon -# Media Type = DDS-4 # must be same as MediaType in Storage daemon +# Media Type = tape # must be same as MediaType in Storage daemon #} # Definition of 8mm tape storage device diff --git a/regress/scripts/tls-auth-bacula-dir.conf.in b/regress/scripts/tls-auth-bacula-dir.conf.in index ca99e2ccf9..b6d658406a 100644 --- a/regress/scripts/tls-auth-bacula-dir.conf.in +++ b/regress/scripts/tls-auth-bacula-dir.conf.in @@ -321,7 +321,7 @@ Storage { # SDPort = @sdport@ # Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9" # password for Storage daemon # Device = SDT-10000 # must be same as Device in Storage daemon -# Media Type = DDS-4 # must be same as MediaType in Storage daemon +# Media Type = tape # must be same as MediaType in Storage daemon #} # Definition of 8mm tape storage device diff --git a/regress/scripts/tls-bacula-dir.conf.in b/regress/scripts/tls-bacula-dir.conf.in index 64145520dc..4be53c8824 100644 --- a/regress/scripts/tls-bacula-dir.conf.in +++ b/regress/scripts/tls-bacula-dir.conf.in @@ -318,7 +318,7 @@ Storage { # SDPort = @sdport@ # Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9" # password for Storage daemon # Device = SDT-10000 # must be same as Device in Storage daemon -# Media Type = DDS-4 # must be same as MediaType in Storage daemon +# Media Type = tape # must be same as MediaType in Storage daemon #} # Definition of 8mm tape storage device diff --git a/regress/scripts/win32-bacula-dir-tape.conf.in b/regress/scripts/win32-bacula-dir-tape.conf.in index 327e9971d9..9086d5b29d 100644 --- a/regress/scripts/win32-bacula-dir-tape.conf.in +++ b/regress/scripts/win32-bacula-dir-tape.conf.in @@ -31,7 +31,7 @@ Job { Type = Backup Client=@win32_client@ FileSet="Full Set" - Storage = DDS-4 + Storage = tape Messages = Standard Pool = Default Write Bootstrap = "@working_dir@/NightlySave.bsr" @@ -46,7 +46,7 @@ Job { Type = Restore Client=@win32_client@ FileSet="Full Set" - Storage = DDS-4 + Storage = tape Messages = Standard Pool = Default Where = @tmpdir@/bacula-restores @@ -103,12 +103,12 @@ Client { # Definition of DDS tape storage device Storage { - Name = DDS-4 + Name = tape Address = @hostname@-sd # N.B. Use a fully qualified name here SDPort = @sdport@ 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 + Device = tape # must be same as Device in Storage daemon + Media Type = tape # must be same as MediaType in Storage daemon AutoChanger = yes Maximum Concurrent Jobs = 4 } diff --git a/regress/scripts/win32-bacula-sd-tape.conf.in b/regress/scripts/win32-bacula-sd-tape.conf.in index 759b65c799..ac8d8dedd9 100644 --- a/regress/scripts/win32-bacula-sd-tape.conf.in +++ b/regress/scripts/win32-bacula-sd-tape.conf.in @@ -33,8 +33,8 @@ Director { # Device { - Name = DDS-4 # - Media Type = DDS-4 + Name = tape # + Media Type = tape Archive Device = @tape_drive@ AutomaticMount = yes; # when device opened, read it AlwaysOpen = yes; diff --git a/regress/tests/2drive-2disk b/regress/tests/2drive-2disk index f4917915d9..20e2b478fd 100755 --- a/regress/tests/2drive-2disk +++ b/regress/tests/2drive-2disk @@ -34,12 +34,12 @@ cat <${cwd}/tmp/bconcmds messages @$out ${cwd}/tmp/log1.out setdebug level=3 dir -setdebug level=3 storage=DDS-4 +setdebug level=3 storage=tape setdebug level=3 client=$CLIENT -label storage=DDS-4 volume=TestVolume001 slot=1 Pool=Default drive=1 -# label storage=DDS-4 volume=TestVolume002 slot=2 Pool=Default drive=1 -status storage=DDS-4 -setdebug level=120 storage=DDS-4 +label storage=tape volume=TestVolume001 slot=1 Pool=Default drive=1 +# label storage=tape volume=TestVolume002 slot=2 Pool=Default drive=1 +status storage=tape +setdebug level=120 storage=tape run job=NightlySave level=Full yes @sleep 1 run job=NightlySave level=Full yes @@ -50,11 +50,11 @@ run job=NightlySave level=Full yes @sleep 1 run job=NightlySave level=Full yes @sleep 3 -status storage=DDS-4 +status storage=tape wait list volumes list jobs -status storage=DDS-4 +status storage=tape messages quit END_OF_DATA @@ -67,18 +67,18 @@ messages @$out ${cwd}/tmp/log1.out @# Force Incremental on the second Volume # update volume=TestVolume001 VolStatus=Used -status storage=DDS-4 -@#setdebug level=120 storage=DDS-4 +status storage=tape +@#setdebug level=120 storage=tape run level=Incremental job=NightlySave yes wait list volumes -status storage=DDS-4 +status storage=tape messages @# @# now do a restore @# @$out ${cwd}/tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done +restore where=${cwd}/tmp/bacula-restores select all storage=tape done yes wait messages @@ -87,7 +87,7 @@ quit END_OF_DATA run_bconsole -check_for_zombie_jobs storage=DDS-4 +check_for_zombie_jobs storage=tape stop_bacula check_two_logs diff --git a/regress/tests/2drive-2job-test b/regress/tests/2drive-2job-test index d7f8880d86..9e7ebd14b9 100755 --- a/regress/tests/2drive-2job-test +++ b/regress/tests/2drive-2job-test @@ -32,23 +32,23 @@ cat <${cwd}/tmp/bconcmds @$out /dev/null messages @$out ${cwd}/tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=2 Pool=Default drive=0 -label storage=DDS-4 volume=TestVolume002 slot=1 Pool=Default drive=1 -status storage=DDS-4 -@#unmount storage=DDS-4 drive=0 -@#unmount storage=DDS-4 drive=1 -@#mount storage=DDS-4 slot=2 drive=0 -@#mount storage=DDS-4 slot=1 drive=1 -status storage=DDS-4 -setdebug level=120 storage=DDS-4 +label storage=tape volume=TestVolume001 slot=2 Pool=Default drive=0 +label storage=tape volume=TestVolume002 slot=1 Pool=Default drive=1 +status storage=tape +@#unmount storage=tape drive=0 +@#unmount storage=tape drive=1 +@#mount storage=tape slot=2 drive=0 +@#mount storage=tape slot=1 drive=1 +status storage=tape +setdebug level=120 storage=tape run job=$JobName level=Full yes @sleep 2 run job=$JobName level=Full yes -status storage=DDS-4 +status storage=tape wait list volumes list jobs -status storage=DDS-4 +status storage=tape messages quit END_OF_DATA @@ -61,11 +61,11 @@ messages @# now do a restore @# @$out ${cwd}/tmp/log2.out -@#unmount storage=DDS-4 drive=0 -@#unmount storage=DDS-4 drive=1 -@#mount storage=DDS-4 slot=1 drive=0 -@#mount storage=DDS-4 slot=2 drive=1 -restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done +@#unmount storage=tape drive=0 +@#unmount storage=tape drive=1 +@#mount storage=tape slot=1 drive=0 +@#mount storage=tape slot=2 drive=1 +restore where=${cwd}/tmp/bacula-restores select all storage=tape done yes wait messages @@ -73,7 +73,7 @@ quit END_OF_DATA run_bconsole -check_for_zombie_jobs storage=DDS-4 +check_for_zombie_jobs storage=tape stop_bacula check_two_logs diff --git a/regress/tests/2drive-3pool-test b/regress/tests/2drive-3pool-test index 878c248760..9693cf1696 100755 --- a/regress/tests/2drive-3pool-test +++ b/regress/tests/2drive-3pool-test @@ -33,24 +33,24 @@ cat <${cwd}/tmp/bconcmds @$out /dev/null messages @$out ${cwd}/tmp/log1.out -setdebug level=51 storage=DDS-4 -label storage=DDS-4 volume=TestVolume001 slot=1 Pool=Default drive=0 -label storage=DDS-4 volume=TestVolume002 slot=2 Pool=Full drive=1 -@#label storage=DDS-4 volume=TestVolume003 slot=3 Pool=Inc drive=2 -status storage=DDS-4 +setdebug level=51 storage=tape +label storage=tape volume=TestVolume001 slot=1 Pool=Default drive=0 +label storage=tape volume=TestVolume002 slot=2 Pool=Full drive=1 +@#label storage=tape volume=TestVolume003 slot=3 Pool=Inc drive=2 +status storage=tape @#run job=$JobName level=Full Pool=Inc yes run job=$JobName level=Full Pool=Full yes run job=$JobName level=Full Pool=Default yes -setdebug level=200 storage=DDS-4 +setdebug level=200 storage=tape run job=$JobName level=Full Pool=Default yes run job=$JobName level=Full Pool=Default yes @sleep 10 -status storage=DDS-4 +status storage=tape list volumes wait list volumes list jobs -status storage=DDS-4 +status storage=tape messages quit END_OF_DATA @@ -65,7 +65,7 @@ messages @# now do a restore @# @$out ${cwd}/tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done +restore where=${cwd}/tmp/bacula-restores select all storage=tape done yes wait messages @@ -74,7 +74,7 @@ END_OF_DATA run_bconsole -check_for_zombie_jobs storage=DDS-4 +check_for_zombie_jobs storage=tape stop_bacula check_two_logs diff --git a/regress/tests/2drive-concurrent-test b/regress/tests/2drive-concurrent-test index 5f9015e005..716b4c8f79 100755 --- a/regress/tests/2drive-concurrent-test +++ b/regress/tests/2drive-concurrent-test @@ -23,41 +23,41 @@ cat <${cwd}/tmp/bconcmds @$out /dev/null messages @$out ${cwd}/tmp/log1.out -label pool=Default storage=DDS-4 volume=TestVolume001 slot=1 drive=0 -label pool=Default storage=DDS-4 volume=TestVolume002 slot=2 drive=1 +label pool=Default storage=tape volume=TestVolume001 slot=1 drive=0 +label pool=Default storage=tape volume=TestVolume002 slot=2 drive=1 update Volume=TestVolume001 MaxVolBytes=100000000 @#50000000 @#12 -setdebug level=200 Storage=DDS-4 -status storage=DDS-4 +setdebug level=200 Storage=tape +status storage=tape list jobs list volumes -run job=$JobName level=Full Storage=DDS-4 +run job=$JobName level=Full Storage=tape yes @#reload list jobs list volumes -run job=$JobName level=Full Storage=DDS-4 +run job=$JobName level=Full Storage=tape yes @#reload list jobs list volumes -run job=$JobName level=Full Storage=DDS-4 +run job=$JobName level=Full Storage=tape yes @#reload list jobs list volumes -status storage=DDS-4 -run job=$JobName level=Full Storage=DDS-4 +status storage=tape +run job=$JobName level=Full Storage=tape yes -status storage=DDS-4 +status storage=tape @#reload @#reload @#reload @#reload @sleep 2 status dir -status storage=DDS-4 +status storage=tape @#reload @sleep 5 list jobs @@ -66,15 +66,15 @@ messages @#reload @#reload wait -status storage=DDS-4 +status storage=tape @#reload messages @# @# now do a restore @# @$out ${cwd}/tmp/log2.out -status storage=DDS-4 -restore where=${cwd}/tmp/bacula-restores select storage=DDS-4 +status storage=tape +restore where=${cwd}/tmp/bacula-restores select storage=tape unmark * mark * done @@ -88,7 +88,7 @@ quit END_OF_DATA run_bacula -check_for_zombie_jobs storage=DDS-4 +check_for_zombie_jobs storage=tape stop_bacula check_two_logs diff --git a/regress/tests/2drive-incremental-2disk b/regress/tests/2drive-incremental-2disk index 2e3bcbe21c..2a6ff418f5 100755 --- a/regress/tests/2drive-incremental-2disk +++ b/regress/tests/2drive-incremental-2disk @@ -41,26 +41,26 @@ cat <${cwd}/tmp/bconcmds messages @$out ${cwd}/tmp/log1.out setdebug level=3 dir -setdebug level=3 storage=DDS-4 +setdebug level=3 storage=tape setdebug level=3 client=2drive2disk -label storage=DDS-4 volume=TestVolume001 slot=1 Pool=Default drive=0 -label storage=DDS-4 volume=TestVolume002 slot=2 Pool=Default drive=1 -status storage=DDS-4 -setdebug level=200 storage=DDS-4 +label storage=tape volume=TestVolume001 slot=1 Pool=Default drive=0 +label storage=tape volume=TestVolume002 slot=2 Pool=Default drive=1 +status storage=tape +setdebug level=200 storage=tape run job=NightlySave yes run job=NightlySave yes run job=NightlySave yes run job=NightlySave yes run job=NightlySave yes wait jobid=2 -status storage=DDS-4 +status storage=tape list volumes list jobs messages wait list volumes list jobs -status storage=DDS-4 +status storage=tape messages quit END_OF_DATA @@ -76,13 +76,13 @@ messages @$out ${cwd}/tmp/log1.out @# Force Incremental on the second Volume update volume=TestVolume001 VolStatus=Used -status storage=DDS-4 +status storage=tape list volumes -@#setdebug level=120 storage=DDS-4 +@#setdebug level=120 storage=tape run level=Incremental job=NightlySave yes wait list volumes -status storage=DDS-4 +status storage=tape messages @# @# now do a restore @@ -100,7 +100,7 @@ END_OF_DATA run_bconsole -check_for_zombie_jobs storage=DDS-4 +check_for_zombie_jobs storage=tape stop_bacula diff --git a/regress/tests/2drive-incremental-changer b/regress/tests/2drive-incremental-changer index f78c6c3b6c..9e38d0faf8 100755 --- a/regress/tests/2drive-incremental-changer +++ b/regress/tests/2drive-incremental-changer @@ -43,20 +43,20 @@ cat <${cwd}/tmp/bconcmds @$out /dev/null messages @$out ${cwd}/tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=$SLOT1 Pool=Default drive=$DRIVE1 -label storage=DDS-4 volume=TestVolume002 slot=$SLOT2 Pool=Default drive=$DRIVE2 -@#setdebug level=100 storage=DDS-4 +label storage=tape volume=TestVolume001 slot=$SLOT1 Pool=Default drive=$DRIVE1 +label storage=tape volume=TestVolume002 slot=$SLOT2 Pool=Default drive=$DRIVE2 +@#setdebug level=100 storage=tape run job=NightlySave yes run job=NightlySave yes run job=NightlySave yes run job=NightlySave yes run job=NightlySave yes @sleep 3 -status storage=DDS-4 +status storage=tape wait list volumes list jobs -status storage=DDS-4 +status storage=tape messages quit END_OF_DATA @@ -72,12 +72,12 @@ messages @$out ${cwd}/tmp/log1.out @# Force Incremental on the second Volume update volume=TestVolume001 VolStatus=Used -status storage=DDS-4 -@#setdebug level=400 storage=DDS-4 +status storage=tape +@#setdebug level=400 storage=tape run level=Incremental job=NightlySave yes wait list volumes -status storage=DDS-4 +status storage=tape messages @# @# now do a restore @@ -94,7 +94,7 @@ quit END_OF_DATA run_bconsole -check_for_zombie_jobs storage=DDS-4 +check_for_zombie_jobs storage=tape stop_bacula check_two_logs diff --git a/regress/tests/2drive-offline-test b/regress/tests/2drive-offline-test index 0febc57ae5..461f3a702d 100755 --- a/regress/tests/2drive-offline-test +++ b/regress/tests/2drive-offline-test @@ -35,18 +35,18 @@ cat <${cwd}/tmp/bconcmds @$out /dev/null messages @$out ${cwd}/tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=2 Pool=Default drive=0 -label storage=DDS-4 volume=TestVolume002 slot=1 Pool=Default drive=1 -status storage=DDS-4 -setdebug level=120 storage=DDS-4 +label storage=tape volume=TestVolume001 slot=2 Pool=Default drive=0 +label storage=tape volume=TestVolume002 slot=1 Pool=Default drive=1 +status storage=tape +setdebug level=120 storage=tape run job=Offline level=Full yes @sleep 2 run job=$JobName level=Full yes -status storage=DDS-4 +status storage=tape wait list volumes list jobs -status storage=DDS-4 +status storage=tape messages quit END_OF_DATA @@ -59,11 +59,11 @@ messages @# now do a restore @# @$out ${cwd}/tmp/log2.out -@#unmount storage=DDS-4 drive=0 -@#unmount storage=DDS-4 drive=1 -@#mount storage=DDS-4 slot=1 drive=0 -@#mount storage=DDS-4 slot=2 drive=1 -restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done +@#unmount storage=tape drive=0 +@#unmount storage=tape drive=1 +@#mount storage=tape slot=1 drive=0 +@#mount storage=tape slot=2 drive=1 +restore where=${cwd}/tmp/bacula-restores select all storage=tape done yes wait messages @@ -71,7 +71,7 @@ quit END_OF_DATA run_bconsole -check_for_zombie_jobs storage=DDS-4 +check_for_zombie_jobs storage=tape stop_bacula check_two_logs diff --git a/regress/tests/2drive-swap-test b/regress/tests/2drive-swap-test index cd2bb97615..c6a7773be0 100755 --- a/regress/tests/2drive-swap-test +++ b/regress/tests/2drive-swap-test @@ -32,10 +32,10 @@ cat <${cwd}/tmp/bconcmds @$out /dev/null messages @$out ${cwd}/tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=1 Pool=Default drive=0 -label storage=DDS-4 volume=TestVolume002 slot=2 Pool=Default drive=1 -status storage=DDS-4 -@#setdebug level=120 storage=DDS-4 +label storage=tape volume=TestVolume001 slot=1 Pool=Default drive=0 +label storage=tape volume=TestVolume002 slot=2 Pool=Default drive=1 +status storage=tape +@#setdebug level=120 storage=tape run job=$JobName level=Full yes @sleep 2 run job=$JobName level=Full yes @@ -43,7 +43,7 @@ wait list volumes list jobs update volume=TestVolume001 maxvolbytes=40123123 -setdebug level=150 storage=DDS-4 +setdebug level=150 storage=tape run job=$JobName level=Full yes wait list volumes @@ -60,7 +60,7 @@ messages @# now do a restore @# @$out ${cwd}/tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done +restore where=${cwd}/tmp/bacula-restores select all storage=tape done yes wait messages @@ -68,7 +68,7 @@ quit END_OF_DATA run_bconsole -check_for_zombie_jobs storage=DDS-4 +check_for_zombie_jobs storage=tape stop_bacula check_two_logs diff --git a/regress/tests/ansi-label-tape b/regress/tests/ansi-label-tape index d8ce5ecf78..ad9ab44515 100755 --- a/regress/tests/ansi-label-tape +++ b/regress/tests/ansi-label-tape @@ -28,14 +28,14 @@ cat <${cwd}/tmp/bconcmds @$out /dev/null messages @$out ${cwd}/tmp/log1.out -setdebug level=200 storage=DDS-4 -label storage=DDS-4 volume=Vol001 slot=0 pool=Default +setdebug level=200 storage=tape +label storage=tape volume=Vol001 slot=0 pool=Default purge volume=Vol001 -relabel pool=Default storage=DDS-4 oldVolume=Vol001 volume=Vol002 slot=0 +relabel pool=Default storage=tape oldVolume=Vol001 volume=Vol002 slot=0 purge volume=Vol002 -relabel pool=Default storage=DDS-4 oldVolume=Vol002 volume=Vol001 slot=0 +relabel pool=Default storage=tape oldVolume=Vol002 volume=Vol001 slot=0 run job=$JobName yes -status storage=DDS-4 +status storage=tape @sleep 1 wait messages @@ -43,8 +43,8 @@ messages @# now do a restore @# @$out ${cwd}/tmp/log2.out -setdebug level=200 storage=DDS-4 -restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done +setdebug level=200 storage=tape +restore where=${cwd}/tmp/bacula-restores select all storage=tape done yes wait list volumes @@ -52,7 +52,7 @@ messages END_OF_DATA run_bacula -check_for_zombie_jobs storage=DDS-4 +check_for_zombie_jobs storage=tape stop_bacula # @@ -66,7 +66,7 @@ cat <${cwd}/tmp/bconcmds messages @$out ${cwd}/tmp/log1.out list volumes -@#setdebug level=300 storage=DDS-4 +@#setdebug level=300 storage=tape run job=$JobName yes wait list volumes @@ -76,7 +76,7 @@ messages @# @$out ${cwd}/tmp/log2.out list volumes -restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done +restore where=${cwd}/tmp/bacula-restores select all storage=tape done yes wait list volumes @@ -85,7 +85,7 @@ quit END_OF_DATA run_bacula -check_for_zombie_jobs storage=DDS-4 +check_for_zombie_jobs storage=tape stop_bacula check_two_logs diff --git a/regress/tests/backup-bacula-tape b/regress/tests/backup-bacula-tape index eb4a664f64..f24979535b 100755 --- a/regress/tests/backup-bacula-tape +++ b/regress/tests/backup-bacula-tape @@ -26,50 +26,50 @@ cat <${cwd}/tmp/bconcmds @$out /dev/null messages @$out ${cwd}/tmp/log1.out -@#setdebug level=200 storage=DDS-4 -label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default +@#setdebug level=200 storage=tape +label storage=tape volume=TestVolume001 slot=0 pool=Default purge volume=TestVolume001 -relabel pool=Default storage=DDS-4 oldVolume=TestVolume001 volume=TestVolume002 slot=0 +relabel pool=Default storage=tape oldVolume=TestVolume001 volume=TestVolume002 slot=0 purge volume=TestVolume002 -relabel pool=Default storage=DDS-4 oldVolume=TestVolume002 volume=TestVolume001 slot=0 +relabel pool=Default storage=tape oldVolume=TestVolume002 volume=TestVolume001 slot=0 run job=$JobName yes -status storage=DDS-4 -status storage=DDS-4 -status storage=DDS-4 -status storage=DDS-4 -status storage=DDS-4 -status storage=DDS-4 +status storage=tape +status storage=tape +status storage=tape +status storage=tape +status storage=tape +status storage=tape @sleep 1 -status storage=DDS-4 -status storage=DDS-4 -status storage=DDS-4 -status storage=DDS-4 -status storage=DDS-4 +status storage=tape +status storage=tape +status storage=tape +status storage=tape +status storage=tape @sleep 1 -status storage=DDS-4 -status storage=DDS-4 -status storage=DDS-4 -status storage=DDS-4 -status storage=DDS-4 +status storage=tape +status storage=tape +status storage=tape +status storage=tape +status storage=tape @sleep 1 -status storage=DDS-4 -status storage=DDS-4 -status storage=DDS-4 -status storage=DDS-4 -status storage=DDS-4 +status storage=tape +status storage=tape +status storage=tape +status storage=tape +status storage=tape @sleep 1 -status storage=DDS-4 -status storage=DDS-4 -status storage=DDS-4 -status storage=DDS-4 -status storage=DDS-4 +status storage=tape +status storage=tape +status storage=tape +status storage=tape +status storage=tape wait messages @# @# now do a restore @# @$out ${cwd}/tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done +restore where=${cwd}/tmp/bacula-restores select all storage=tape done yes wait list volumes @@ -77,7 +77,7 @@ messages END_OF_DATA run_bacula -check_for_zombie_jobs storage=DDS-4 +check_for_zombie_jobs storage=tape stop_bacula # @@ -100,7 +100,7 @@ messages @# @$out ${cwd}/tmp/log2.out list volumes -restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done +restore where=${cwd}/tmp/bacula-restores select all storage=tape done yes wait list volumes @@ -109,7 +109,7 @@ quit END_OF_DATA run_bacula -check_for_zombie_jobs storage=DDS-4 +check_for_zombie_jobs storage=tape stop_bacula check_two_logs diff --git a/regress/tests/backup-win32-tape b/regress/tests/backup-win32-tape index 7b9648403a..f101da942c 100755 --- a/regress/tests/backup-win32-tape +++ b/regress/tests/backup-win32-tape @@ -23,10 +23,10 @@ cat <${cwd}/tmp/bconcmds @$out /dev/null messages @$out ${cwd}/tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default +label storage=tape volume=TestVolume001 slot=0 pool=Default run job=NightlySave yes @sleep 10 -status storage=DDS-4 +status storage=tape @sleep 30 messages wait @@ -35,14 +35,14 @@ messages @# now do a restore @# @$outt ${cwd}/tmp/log2.out -@#restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done +@#restore where=${cwd}/tmp/bacula-restores select all storage=tape done @#yes @#wait @#messages END_OF_DATA run_bacula -check_for_zombie_jobs storage=DDS-4 +check_for_zombie_jobs storage=tape stop_bacula check_two_logs diff --git a/regress/tests/bad-label-changer b/regress/tests/bad-label-changer index c27b17e28c..f8bdc405c0 100755 --- a/regress/tests/bad-label-changer +++ b/regress/tests/bad-label-changer @@ -30,11 +30,11 @@ cat <tmp/bconcmds @$out /dev/null messages @$out tmp/log1.out -label storage=DDS-4 volume=TestVolume002 slot=$SLOT2 pool=Default drive=$DRIVE1 -label storage=DDS-4 volume=TestVolume001 slot=$SLOT1 pool=Default drive=$DRIVE1 +label storage=tape volume=TestVolume002 slot=$SLOT2 pool=Default drive=$DRIVE1 +label storage=tape volume=TestVolume001 slot=$SLOT1 pool=Default drive=$DRIVE1 list volumes @#setdebug level=10 client=$CLIENT -setdebug level=150 storage=DDS-4 +setdebug level=150 storage=tape run job=$JobName yes wait purge volume=TestVolume001 @@ -43,7 +43,7 @@ quit END_OF_DATA run_bacula -check_for_zombie_jobs storage=DDS-4 +check_for_zombie_jobs storage=tape stop_bacula # Overwrite TestVolume001 label @@ -53,14 +53,14 @@ cat <tmp/bconcmds @$out /dev/null messages list volumes -run job=$JobName level=Full storage=DDS-4 yes +run job=$JobName level=Full storage=tape yes wait messages @# @# now do a restore @# @$out tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done +restore where=${cwd}/tmp/bacula-restores select all storage=tape done yes wait messages @@ -68,7 +68,7 @@ quit END_OF_DATA run_bacula -check_for_zombie_jobs storage=DDS-4 +check_for_zombie_jobs storage=tape stop_bacula check_two_logs diff --git a/regress/tests/bscan-fast-tape b/regress/tests/bscan-fast-tape index 3f9f8e6dfa..7c68a78a3a 100755 --- a/regress/tests/bscan-fast-tape +++ b/regress/tests/bscan-fast-tape @@ -25,8 +25,8 @@ cat <tmp/bconcmds @$out /dev/null messages @$out tmp/log1.out -setdebug level=2 storage=DDS-4 -label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default +setdebug level=2 storage=tape +label storage=tape volume=TestVolume001 slot=0 pool=Default run job=$JobName yes wait messages @@ -48,7 +48,7 @@ echo "Starting Bacula tape writing" #quit #END_OF_DATA #run_bacula -#check_for_zombie_jobs storage=DDS-4 +#check_for_zombie_jobs storage=tape #stop_bacula echo "End writing tape" @@ -66,7 +66,7 @@ echo "volume=TestVolume001" >tmp/bscan.bsr bscan_libdbi -strace -o strace.new $bin/bscan -d200 -w working $BSCANLIBDBI -u regress -n regress -m -s -v -b tmp/bscan.bsr -c bin/bacula-sd.conf DDS-4 +strace -o strace.new $bin/bscan -d200 -w working $BSCANLIBDBI -u regress -n regress -m -s -v -b tmp/bscan.bsr -c bin/bacula-sd.conf tape exit cat <tmp/bconcmds @$out /dev/null @@ -75,7 +75,7 @@ messages @# @# now do a restore @# -restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done +restore where=${cwd}/tmp/bacula-restores select all storage=tape done yes wait messages @@ -83,7 +83,7 @@ quit END_OF_DATA run_bacula -check_for_zombie_jobs storage=DDS-4 +check_for_zombie_jobs storage=tape stop_bacula rm -f ${cwd}/build/src/lib/dummy diff --git a/regress/tests/bscan-tape b/regress/tests/bscan-tape index 315f86853f..419fd24e9d 100755 --- a/regress/tests/bscan-tape +++ b/regress/tests/bscan-tape @@ -27,8 +27,8 @@ estimate job=$JobName listing estimate job=$JobName listing messages @$out tmp/log1.out -setdebug level=2 storage=DDS-4 -label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default +setdebug level=2 storage=tape +label storage=tape volume=TestVolume001 slot=0 pool=Default run job=$JobName level=Full yes wait run job=$JobName level=Full yes @@ -38,7 +38,7 @@ quit END_OF_DATA run_bacula -check_for_zombie_jobs storage=DDS-4 +check_for_zombie_jobs storage=tape echo "Backup 1 done" # make some files for the incremental to pick up @@ -59,7 +59,7 @@ quit END_OF_DATA run_bconsole -scripts/check_for_zombie_jobs storage=DDS-4 +scripts/check_for_zombie_jobs storage=tape echo "Backup 2 done" touch ${cwd}/build/src/dird/*.c @@ -69,7 +69,7 @@ touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o # run_bconsole -scripts/check_for_zombie_jobs storage=DDS-4 +scripts/check_for_zombie_jobs storage=tape echo "Backup 3 done" # make some files for the incremental to pick up @@ -80,7 +80,7 @@ touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o # run_bconsole -scripts/check_for_zombie_jobs storage=DDS-4 +scripts/check_for_zombie_jobs storage=tape stop_bacula @@ -106,9 +106,9 @@ else fi if test "$debug" -eq 1 ; then - $bin/bscan -w working $BSCANLIBDBI -u ${db_user} -n ${db_name} $PASSWD -m -s -v -b tmp/bscan.bsr -c bin/bacula-sd.conf DDS-4 + $bin/bscan -w working $BSCANLIBDBI -u ${db_user} -n ${db_name} $PASSWD -m -s -v -b tmp/bscan.bsr -c bin/bacula-sd.conf tape else - $bin/bscan -w working $BSCANLIBDBI -u ${db_user} -n ${db_name} $PASSWD -m -s -v -b tmp/bscan.bsr -c bin/bacula-sd.conf DDS-4 >/dev/null 2>&1 + $bin/bscan -w working $BSCANLIBDBI -u ${db_user} -n ${db_name} $PASSWD -m -s -v -b tmp/bscan.bsr -c bin/bacula-sd.conf tape >/dev/null 2>&1 fi echo $BSCANLIBDBI @@ -120,7 +120,7 @@ messages @# @# now do a restore @# -restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done +restore where=${cwd}/tmp/bacula-restores select all storage=tape done yes wait messages @@ -128,7 +128,7 @@ quit END_OF_DATA run_bacula -check_for_zombie_jobs storage=DDS-4 +check_for_zombie_jobs storage=tape stop_bacula rm -f ${cwd}/build/src/lib/dummy diff --git a/regress/tests/btape-fill-full-changer b/regress/tests/btape-fill-full-changer index 3d892f7ea1..b93505d46b 100755 --- a/regress/tests/btape-fill-full-changer +++ b/regress/tests/btape-fill-full-changer @@ -23,14 +23,14 @@ sed -e 's%64512%262144%' ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf if test "$debug" -eq 1 ; then - $bin/btape -c bin/bacula-sd.conf DDS-4 <${cwd}/tmp/log1.out 2>&1 + $bin/btape -c bin/bacula-sd.conf tape <${cwd}/tmp/log1.out 2>&1 fill m diff --git a/regress/tests/btape-fill-full-tape b/regress/tests/btape-fill-full-tape index f33a89848e..87b8032699 100755 --- a/regress/tests/btape-fill-full-tape +++ b/regress/tests/btape-fill-full-tape @@ -22,7 +22,7 @@ sed -e 's%64512%262144%' ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf if test "$debug" -eq 1 ; then - $bin/btape -c bin/bacula-sd.conf tape <${cwd}/tmp/log1.out 2>&1 +test +yes +quit +END_OF_DATA +fi + +if [ $? != 0 ] ; then + echo " " + echo " " + echo " !!!!! btape-changer test failed!!! !!!!! " + echo " !!!!! btape-changer test failed!!! !!!!! " >>test.out + echo " " + exit 1 +fi + +# +# Increase block size to 262144 +# +cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1 +sed -e 's%64512%262144%' ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf + +if test "$debug" -eq 1 ; then + $bin/btape -c bin/bacula-sd.conf tape <${cwd}/tmp/log2.out 2>&1 +test +yes +quit +END_OF_DATA +fi + +if [ $? != 0 ] ; then + echo " " + echo " " + echo " !!!!! btape-changer test failed!!! !!!!! " + echo " !!!!! btape-changer test failed!!! !!!!! " >>test.out + echo " " +else + echo " ===== btape-changer test OK ===== " + echo " ===== btape-changer test OK ===== " >>test.out + scripts/cleanup +fi diff --git a/regress/tests/btape-test-tape b/regress/tests/btape-test-tape index 9faa43b80c..6afb786ef9 100755 --- a/regress/tests/btape-test-tape +++ b/regress/tests/btape-test-tape @@ -15,7 +15,7 @@ change_jobname $JobName start_test if test "$debug" -eq 1 ; then - $bin/btape -c bin/bacula-sd.conf tape <>test.out + echo " !!!!! btape test failed!!! !!!!! " + echo " !!!!! btape test failed!!! !!!!! " >>test.out echo " " exit 1 fi @@ -42,12 +42,12 @@ cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1 sed -e 's%64512%262144%' ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf if test "$debug" -eq 1 ; then - $bin/btape -c bin/bacula-sd.conf tape <${cwd}/tmp/log1.out 2>&1 + $bin/btape -c bin/bacula-sd.conf tape <${cwd}/tmp/log2.out 2>&1 test quit END_OF_DATA @@ -56,11 +56,11 @@ fi if [ $? != 0 ] ; then echo " " echo " " - echo " !!!!! btape fill test failed!!! !!!!! " - echo " !!!!! btape fill test failed!!! !!!!! " >>test.out + echo " !!!!! btape test failed!!! !!!!! " + echo " !!!!! btape test failed!!! !!!!! " >>test.out echo " " else - echo " ===== btape fill test OK ===== " - echo " ===== btape fill test OK ===== " >>test.out -# scripts/cleanup + echo " ===== btape test OK ===== " + echo " ===== btape test OK ===== " >>test.out + scripts/cleanup fi diff --git a/regress/tests/bug-1227 b/regress/tests/bug-1227 index 4ef4710e87..d70221a82c 100755 --- a/regress/tests/bug-1227 +++ b/regress/tests/bug-1227 @@ -22,7 +22,7 @@ cat <${cwd}/tmp/bconcmds @$out /dev/null messages @$out ${cwd}/tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default +label storage=tape volume=TestVolume001 slot=0 pool=Default messages END_OF_DATA @@ -38,16 +38,16 @@ messages run job=$JobName yes @sleep 10 messages -setdebug level=400 storage=DDS-4 trace=1 +setdebug level=400 storage=tape trace=1 setdebug level=400 director trace=1 -label storage=DDS-4 volume=TestVolume002 slot=0 pool=Default +label storage=tape volume=TestVolume002 slot=0 pool=Default messages @sleep 5 -mount storage=DDS-4 slot=0 +mount storage=tape slot=0 @sleep 2 messages @sleep 2 -mount storage=DDS-4 slot=0 +mount storage=tape slot=0 @sleep 2 messages cancel jobid=1 @@ -57,7 +57,7 @@ list volumes END_OF_DATA run_bacula -check_for_zombie_jobs storage=DDS-4 +check_for_zombie_jobs storage=tape stop_bacula touch ${cwd}/tmp/log2.out diff --git a/regress/tests/eighty-simultaneous-jobs-tape b/regress/tests/eighty-simultaneous-jobs-tape index 560fad68f5..23cac3ff89 100755 --- a/regress/tests/eighty-simultaneous-jobs-tape +++ b/regress/tests/eighty-simultaneous-jobs-tape @@ -20,94 +20,94 @@ cat <${cwd}/tmp/bconcmds @$out /dev/null messages @$out ${cwd}/tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default -setdebug level=60 Storage=DDS-4 +label storage=tape volume=TestVolume001 slot=0 pool=Default +setdebug level=60 Storage=tape setdebug level=60 client -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes @sleep 2 status dir @sleep 5 status dir -status storage=DDS-4 +status storage=tape messages wait messages @@ -115,7 +115,7 @@ messages @# now do a restore @# @$out ${cwd}/tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select storage=DDS-4 +restore where=${cwd}/tmp/bacula-restores select storage=tape unmark * mark * done @@ -126,7 +126,7 @@ quit END_OF_DATA run_bacula -check_for_zombie_jobs storage=DDS-4 +check_for_zombie_jobs storage=tape stop_bacula check_two_logs diff --git a/regress/tests/eot-fail-tape b/regress/tests/eot-fail-tape index 3ba6d725d3..aad6658c3c 100755 --- a/regress/tests/eot-fail-tape +++ b/regress/tests/eot-fail-tape @@ -24,7 +24,7 @@ cat <${cwd}/tmp/bconcmds @$out /dev/null messages @$out tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default +label storage=tape volume=TestVolume001 slot=0 pool=Default @#update Volume=TestVolume001 MaxVolBytes=3000000 run job=$JobName yes wait @@ -33,7 +33,7 @@ messages @# now do a restore @# @$out tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done +restore where=${cwd}/tmp/bacula-restores select all storage=tape done yes wait messages @@ -41,7 +41,7 @@ quit END_OF_DATA run_bacula -check_for_zombie_jobs storage=DDS-4 +check_for_zombie_jobs storage=tape stop_bacula check_two_logs diff --git a/regress/tests/fast-two-pool-test b/regress/tests/fast-two-pool-test index 545e9bf7e2..7228647eb8 100755 --- a/regress/tests/fast-two-pool-test +++ b/regress/tests/fast-two-pool-test @@ -31,19 +31,19 @@ cat <${cwd}/tmp/bconcmds @$out /dev/null messages @$out ${cwd}/tmp/log1.out -@#setdebug level=150 storage=DDS-4 -label storage=DDS-4 volume=TestVolume001 slot=1 pool=Full drive=0 -label storage=DDS-4 volume=TestVolume002 slot=2 pool=Default drive=0 +@#setdebug level=150 storage=tape +label storage=tape volume=TestVolume001 slot=1 pool=Full drive=0 +label storage=tape volume=TestVolume002 slot=2 pool=Default drive=0 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 @# wait between starting jobs @sleep 10 -@#setdebug level=100 storage=DDS-4 +@#setdebug level=100 storage=tape run job=NightlySave1 level=Full pool=Full yes run job=NightlySave1 level=Full pool=Full yes -status storage=DDS-4 +status storage=tape messages wait list volumes @@ -54,11 +54,11 @@ messages @$out ${cwd}/tmp/log2.out list volumes list jobs -status storage=DDS-4 +status storage=tape messages -setdebug level=150 storage=DDS-4 +setdebug level=150 storage=tape @#setdebug level=200 client -restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done +restore where=${cwd}/tmp/bacula-restores select all storage=tape done yes wait messages @@ -67,7 +67,7 @@ END_OF_DATA # exit run_bacula -check_for_zombie_jobs storage=DDS-4 +check_for_zombie_jobs storage=tape stop_bacula check_two_logs diff --git a/regress/tests/fixed-block-size-tape b/regress/tests/fixed-block-size-tape index bc5eba1f78..79ec0c0088 100755 --- a/regress/tests/fixed-block-size-tape +++ b/regress/tests/fixed-block-size-tape @@ -35,8 +35,8 @@ cat <${cwd}/tmp/bconcmds @$out /dev/null messages @$out ${cwd}/tmp/log1.out -setdebug level=51 storage=DDS-4 -label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default +setdebug level=51 storage=tape +label storage=tape volume=TestVolume001 slot=0 pool=Default run job=$JobName yes wait messages @@ -44,7 +44,7 @@ messages @# now do a restore @# @$out ${cwd}/tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select storage=DDS-4 +restore where=${cwd}/tmp/bacula-restores select storage=tape unmark * mark * done @@ -55,7 +55,7 @@ quit END_OF_DATA run_bacula -check_for_zombie_jobs storage=DDS-4 +check_for_zombie_jobs storage=tape stop_bacula check_two_logs diff --git a/regress/tests/four-concurrent-jobs-tape b/regress/tests/four-concurrent-jobs-tape index 64471f3805..cf31406593 100755 --- a/regress/tests/four-concurrent-jobs-tape +++ b/regress/tests/four-concurrent-jobs-tape @@ -20,16 +20,16 @@ cat <${cwd}/tmp/bconcmds @$out /dev/null messages @$out ${cwd}/tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes +label storage=tape volume=TestVolume001 slot=0 pool=Default +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes +run job=$JobName level=Full Storage=tape yes @sleep 2 status dir @sleep 5 status dir -status storage=DDS-4 +status storage=tape messages wait messages @@ -42,7 +42,7 @@ select JobId,MediaId,StartFile,StartBlock,EndFile,EndBlock from JobMedia; @# now do a restore @# @$out ${cwd}/tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select storage=DDS-4 +restore where=${cwd}/tmp/bacula-restores select storage=tape unmark * mark * done @@ -53,7 +53,7 @@ quit END_OF_DATA run_bacula -check_for_zombie_jobs storage=DDS-4 +check_for_zombie_jobs storage=tape stop_bacula check_two_logs diff --git a/regress/tests/four-jobs-tape b/regress/tests/four-jobs-tape index 6ccb740636..86c44b8c31 100755 --- a/regress/tests/four-jobs-tape +++ b/regress/tests/four-jobs-tape @@ -24,7 +24,7 @@ estimate job=$JobName estimate job=$JobName messages @$out ${cwd}/tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default +label storage=tape volume=TestVolume001 slot=0 pool=Default run job=$JobName yes wait messages @@ -32,7 +32,7 @@ quit END_OF_DATA run_bacula -scripts/check_for_zombie_jobs storage=DDS-4 +scripts/check_for_zombie_jobs storage=tape 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,7 +53,7 @@ END_OF_DATA run_bacula -scripts/check_for_zombie_jobs storage=DDS-4 +scripts/check_for_zombie_jobs storage=tape echo "Backup 2 done" touch ${cwd}/build/src/dird/*.c touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o @@ -72,7 +72,7 @@ END_OF_DATA run_bacula -scripts/check_for_zombie_jobs storage=DDS-4 +scripts/check_for_zombie_jobs storage=tape echo "Backup 3 done" # make some files for the incremental to pick up touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o @@ -90,7 +90,7 @@ quit END_OF_DATA run_bacula -scripts/check_for_zombie_jobs storage=DDS-4 +scripts/check_for_zombie_jobs storage=tape echo "Backup 4 done" # # now do several restores to ensure we cleanup between jobs @@ -108,7 +108,7 @@ wait @# now unmount the tape and start two restores @# at the same time @# -unmount storage=DDS-4 +unmount storage=tape restore where=${cwd}/tmp/bacula-restores select all done yes restore where=${cwd}/tmp/bacula-restores select @@ -116,14 +116,14 @@ unmark * mark * done yes -mount storage=DDS-4 +mount storage=tape wait messages quit END_OF_DATA run_bacula -check_for_zombie_jobs storage=DDS-4 +check_for_zombie_jobs storage=tape stop_bacula check_two_logs diff --git a/regress/tests/incremental-2disk b/regress/tests/incremental-2disk index 377ca6776b..500d854afc 100755 --- a/regress/tests/incremental-2disk +++ b/regress/tests/incremental-2disk @@ -31,8 +31,8 @@ cat <${cwd}/tmp/bconcmds @$out /dev/null messages @$out ${cwd}/tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=1 Pool=Default drive=0 -label storage=DDS-4 volume=TestVolume002 slot=2 Pool=Default drive=0 +label storage=tape volume=TestVolume001 slot=1 Pool=Default drive=0 +label storage=tape volume=TestVolume002 slot=2 Pool=Default drive=0 run job=$JobName yes wait messages diff --git a/regress/tests/incremental-2media b/regress/tests/incremental-2media index 91adeb930f..9e301c8feb 100755 --- a/regress/tests/incremental-2media +++ b/regress/tests/incremental-2media @@ -24,7 +24,7 @@ cat <${cwd}/tmp/bconcmds @$out /dev/null messages @$out ${cwd}/tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=1 Pool=Default drive=0 +label storage=tape volume=TestVolume001 slot=1 Pool=Default drive=0 label storage=File volume=TestVolume002 Pool=Default run job=$JobName yes wait @@ -53,14 +53,14 @@ messages @# now do a restore @# @$out ${cwd}/tmp/log2.out -setdebug level=151 storage=DDS-4 +setdebug level=151 storage=tape restore where=${cwd}/tmp/bacula-restores select all done yes wait restore where=${cwd}/tmp/bacula-restores select all done yes wait -status storage=DDS-4 +status storage=tape messages quit END_OF_DATA diff --git a/regress/tests/incremental-2media-tape b/regress/tests/incremental-2media-tape index 70917209b3..0c3f1ca732 100755 --- a/regress/tests/incremental-2media-tape +++ b/regress/tests/incremental-2media-tape @@ -41,7 +41,7 @@ cat <${cwd}/tmp/bconcmds @$out /dev/null messages @$out ${cwd}/tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=$SLOT1 Pool=Default drive=$DRIVE1 +label storage=tape volume=TestVolume001 slot=$SLOT1 Pool=Default drive=$DRIVE1 label storage=DLT80 volume=TestVolume002 Pool=Default run job=$JobName yes wait @@ -71,7 +71,7 @@ messages @# now do a restore @# @$out ${cwd}/tmp/log2.out -setdebug level=51 storage=DDS-4 +setdebug level=51 storage=tape restore where=${cwd}/tmp/bacula-restores select all done yes wait diff --git a/regress/tests/incremental-changer b/regress/tests/incremental-changer index 62c650da88..daa324c3a9 100755 --- a/regress/tests/incremental-changer +++ b/regress/tests/incremental-changer @@ -33,8 +33,8 @@ cat <${cwd}/tmp/bconcmds @$out /dev/null messages @$out ${cwd}/tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=$SLOT1 Pool=Default drive=$DRIVE1 -label storage=DDS-4 volume=TestVolume002 slot=$SLOT2 Pool=Default drive=$DRIVE1 +label storage=tape volume=TestVolume001 slot=$SLOT1 Pool=Default drive=$DRIVE1 +label storage=tape volume=TestVolume002 slot=$SLOT2 Pool=Default drive=$DRIVE1 run job=NightlySave yes wait messages @@ -71,7 +71,7 @@ END_OF_DATA run_bconsole -check_for_zombie_jobs storage=DDS-4 +check_for_zombie_jobs storage=tape stop_bacula check_two_logs rstat=$? diff --git a/regress/tests/incremental-tape b/regress/tests/incremental-tape index cfc7423c4d..26d62deb43 100755 --- a/regress/tests/incremental-tape +++ b/regress/tests/incremental-tape @@ -29,7 +29,7 @@ cat <${cwd}/tmp/bconcmds @$out /dev/null messages @$out ${cwd}/tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default +label storage=tape volume=TestVolume001 slot=0 pool=Default run job=$JobName yes wait messages @@ -37,7 +37,7 @@ quit END_OF_DATA run_bacula -check_for_zombie_jobs storage=DDS-4 +check_for_zombie_jobs storage=tape echo "ficheriro1.txt" >${cwd}/tmp/build/ficheriro1.txt echo "ficheriro2.txt" >${cwd}/tmp/build/ficheriro2.txt @@ -53,7 +53,7 @@ messages @# now do a restore @# @$out ${cwd}/tmp/log2.out -restore where=${cwd}/tmp/bacula-restores storage=DDS-4 +restore where=${cwd}/tmp/bacula-restores storage=tape 7 <${cwd}/tmp/restore-list @@ -64,7 +64,7 @@ quit END_OF_DATA run_bconsole -check_for_zombie_jobs storage=DDS-4 +check_for_zombie_jobs storage=tape stop_bacula # diff --git a/regress/tests/lib-tape-root b/regress/tests/lib-tape-root index 0ee005adc9..c7a97cca8c 100755 --- a/regress/tests/lib-tape-root +++ b/regress/tests/lib-tape-root @@ -19,7 +19,7 @@ cat < >${cwd}/tmp/bconcmds @$out /dev/null messages @$out ${cwd}/tmp/log1.out -label storage=DDS-4 Volume=TestVolume001 slot=0 +label storage=tape Volume=TestVolume001 slot=0 run job=NightlySave yes wait messages diff --git a/regress/tests/manual-two-vol-tape b/regress/tests/manual-two-vol-tape index 1b8a155289..9d7d52dbaf 100755 --- a/regress/tests/manual-two-vol-tape +++ b/regress/tests/manual-two-vol-tape @@ -42,8 +42,8 @@ cat <tmp/bconcmds @out /dev/null messages @$out tmp/log1.out -label storage=DDS-4 volume=TestVolume002 slot=0 pool=Default drive=0 -unmount storage=DDS-4 +label storage=tape volume=TestVolume002 slot=0 pool=Default drive=0 +unmount storage=tape quit END_OF_DATA @@ -56,19 +56,19 @@ init_drive ${TAPE_DRIVE} # label first volume, and run first half of job cat <tmp/bconcmds @$out tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default drive=0 +label storage=tape volume=TestVolume001 slot=0 pool=Default drive=0 update Volume=TestVolume001 MaxVolBytes=500000 pool=Default drive=0 list volumes -@#setdebug level=150 storage=DDS-4 +@#setdebug level=150 storage=tape run job=$JobName yes @# This sleep must be long enough for the first tape to fill (4MB) @# otherwise the following mtx-changer commands will fail @#sleep $sleep wait mount timeout=180 list volumes -unmount storage=DDS-4 +unmount storage=tape list volumes -status storage=DDS-4 +status storage=tape messages quit END_OF_DATA @@ -80,20 +80,20 @@ load_other_slot $slot cat <tmp/bconcmds @$out tmp/log1.out wait mount timeout=180 -setdebug level=200 storage=DDS-4 -mount storage=DDS-4 +setdebug level=200 storage=tape +mount storage=tape @# backup should continue wait list volumes @# @# now do a restore @# -restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done +restore where=${cwd}/tmp/bacula-restores select all storage=tape done yes @sleep $sleep wait mount timeout=180 exec "sh -c 'load_other_slot $slot'" -unmount storage=DDS-4 +unmount storage=tape list volumes messages wait @@ -105,7 +105,7 @@ run_bconsole touch tmp/log2.out -check_for_zombie_jobs storage=DDS-4 +check_for_zombie_jobs storage=tape stop_bacula check_two_logs diff --git a/regress/tests/memory-bug-tape b/regress/tests/memory-bug-tape index a8379ceedf..680061e659 100755 --- a/regress/tests/memory-bug-tape +++ b/regress/tests/memory-bug-tape @@ -23,8 +23,8 @@ cat <${cwd}/tmp/bconcmds @$out /dev/null messages @$out ${cwd}/tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default -run job=$JobName level=Full Storage=DDS-4 yes +label storage=tape volume=TestVolume001 slot=0 pool=Default +run job=$JobName level=Full Storage=tape yes sql SELECT * from File; SELECT * from File; @@ -20032,7 +20032,7 @@ SELECT * FROM Media; status dir @sleep 5 status dir -status storage=DDS-4 +status storage=tape messages wait messages @@ -20040,7 +20040,7 @@ messages @# now do a restore @# @$out ${cwd}/tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select storage=DDS-4 +restore where=${cwd}/tmp/bacula-restores select storage=tape unmark * mark * done @@ -20051,7 +20051,7 @@ quit END_OF_DATA run_bacula -check_for_zombie_jobs storage=DDS-4 +check_for_zombie_jobs storage=tape stop_bacula check_two_logs diff --git a/regress/tests/multi-storage-test b/regress/tests/multi-storage-test index 9bf0b4dc9c..5c13487ce4 100755 --- a/regress/tests/multi-storage-test +++ b/regress/tests/multi-storage-test @@ -45,9 +45,9 @@ cat <${cwd}/tmp/bconcmds @$out /dev/null messages @$out ${cwd}/tmp/log1.out -label storage=DDS-4 volume=TestVolume001 Pool=Default slot=1 drive=0 +label storage=tape volume=TestVolume001 Pool=Default slot=1 drive=0 label storage=File volume=TestVolume002 Pool=Default -run job=$JobName storage=DDS-4 yes +run job=$JobName storage=tape yes wait messages quit @@ -83,7 +83,7 @@ END_OF_DATA run_bconsole check_for_zombie_jobs storage=File -check_for_zombie_jobs storage=DDS-4 +check_for_zombie_jobs storage=tape stop_bacula $tmp/bacula-ctl-sd stop &> /dev/null diff --git a/regress/tests/relabel-tape b/regress/tests/relabel-tape index 80e0f09e23..9ff96c59fa 100755 --- a/regress/tests/relabel-tape +++ b/regress/tests/relabel-tape @@ -22,12 +22,12 @@ cat <${cwd}/tmp/bconcmds @$out /dev/null messages @$out ${cwd}/tmp/log1.out -setdebug level=150 storage=DDS-4 -label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default +setdebug level=150 storage=tape +label storage=tape volume=TestVolume001 slot=0 pool=Default run job=$JobName level=Full yes wait messages -add pool=Default storage=DDS-4 +add pool=Default storage=tape 0 TestVolume002 @# set status to append @@ -37,12 +37,12 @@ update volume=TestVolume001 run job=$JobName level=Full yes wait list volumes -unmount storage=DDS-4 -unmount storage=DDS-4 +unmount storage=tape +unmount storage=tape purge volume=TestVolume001 -relabel oldvolume=TestVolume001 volume=TestVolume003 slot=0 pool=Default storage=DDS-4 +relabel oldvolume=TestVolume001 volume=TestVolume003 slot=0 pool=Default storage=tape list volumes -mount storage=DDS-4 +mount storage=tape messages wait run job=$JobName level=Full yes @@ -53,7 +53,7 @@ quit END_OF_DATA run_bacula -check_for_zombie_jobs storage=DDS-4 +check_for_zombie_jobs storage=tape echo "Backup done" @@ -62,7 +62,7 @@ echo "Backup done" # cat <${cwd}/tmp/bconcmds @$out ${cwd}/tmp/log2.out -setdebug level=150 storage=DDS-4 +setdebug level=150 storage=tape list volumes restore where=${cwd}/tmp/bacula-restores select all done yes @@ -76,7 +76,7 @@ wait @# at the same time @# list volumes -unmount storage=DDS-4 +unmount storage=tape restore where=${cwd}/tmp/bacula-restores select all done yes restore where=${cwd}/tmp/bacula-restores select @@ -84,7 +84,7 @@ unmark * mark * done yes -mount storage=DDS-4 +mount storage=tape wait messages quit @@ -92,7 +92,7 @@ END_OF_DATA run_bconsole -check_for_zombie_jobs storage=DDS-4 +check_for_zombie_jobs storage=tape stop_bacula check_two_logs diff --git a/regress/tests/restore-by-file-tape b/regress/tests/restore-by-file-tape index 990c2b8c0b..51a9b8f1ca 100755 --- a/regress/tests/restore-by-file-tape +++ b/regress/tests/restore-by-file-tape @@ -28,7 +28,7 @@ cat <${cwd}/tmp/bconcmds @$out /dev/null messages @$out ${cwd}/tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default +label storage=tape volume=TestVolume001 slot=0 pool=Default run job=$JobName level=Full yes wait messages @@ -36,7 +36,7 @@ messages @# now do a restore @# @$out ${cwd}/tmp/log2.out -restore where=${cwd}/tmp/bacula-restores storage=DDS-4 file=<${cwd}/tmp/restore2-list +restore where=${cwd}/tmp/bacula-restores storage=tape file=<${cwd}/tmp/restore2-list yes wait messages @@ -44,7 +44,7 @@ quit END_OF_DATA run_bacula -check_for_zombie_jobs storage=DDS-4 +check_for_zombie_jobs storage=tape stop_bacula dstat=0 @@ -85,12 +85,12 @@ END_OF_DATA # test appending to a previously written tape # run_bacula -check_for_zombie_jobs storage=DDS-4 +check_for_zombie_jobs storage=tape stop_bacula check_two_logs -scripts/check_for_zombie_jobs storage=DDS-4 +scripts/check_for_zombie_jobs storage=tape stop_bacula for i in `cat ${cwd}/tmp/restore2-list`; do diff $i ${cwd}/tmp/bacula-restores$i diff --git a/regress/tests/restore-seek-tape b/regress/tests/restore-seek-tape index deb06ff7d6..f543caab4b 100755 --- a/regress/tests/restore-seek-tape +++ b/regress/tests/restore-seek-tape @@ -55,7 +55,7 @@ cat <${cwd}/tmp/bconcmds @$out /dev/null messages @$out ${cwd}/tmp/log1.out -label storage=DDS-4 volume=TestVolume001 pool=Default +label storage=tape volume=TestVolume001 pool=Default run job=$JobName yes wait messages @@ -64,12 +64,12 @@ messages @# @$out ${cwd}/tmp/log2.out setdebug level=30 fd -setdebug level=10 storage=DDS-4 +setdebug level=10 storage=tape sql @# print the JobMedia records select * from JobMedia; -restore bootstrap=${cwd}/tmp/kern.bsr where=${cwd}/tmp/bacula-restores storage=DDS-4 +restore bootstrap=${cwd}/tmp/kern.bsr where=${cwd}/tmp/bacula-restores storage=tape 7 <${cwd}/tmp/restore-list @@ -80,7 +80,7 @@ quit END_OF_DATA run_bacula -check_for_zombie_jobs storage=DDS-4 +check_for_zombie_jobs storage=tape stop_bacula # Now setup a control directory of only what we *should* restore diff --git a/regress/tests/scratch-pool-test b/regress/tests/scratch-pool-test index d73e1e07e5..01723d1537 100755 --- a/regress/tests/scratch-pool-test +++ b/regress/tests/scratch-pool-test @@ -39,11 +39,11 @@ cat <${cwd}/tmp/bconcmds @$out /dev/null messages @$out ${cwd}/tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=1 pool=Scratch drive=0 -label storage=DDS-4 volume=TestVolume002 slot=2 pool=Scratch drive=0 +label storage=tape volume=TestVolume001 slot=1 pool=Scratch drive=0 +label storage=tape volume=TestVolume002 slot=2 pool=Scratch drive=0 update Volume=TestVolume001 MaxVolBytes=2000000 pool=Scratch drive=0 update Volume=TestVolume001 inchanger=no pool=Scratch drive=0 -@#setdebug level=200 storage=DDS-4 +@#setdebug level=200 storage=tape llist volume=TestVolume001 llist volume=TestVolume002 run job=$JobName yes @@ -55,7 +55,7 @@ llist volume=TestVolume001 @# now do a restore @# @$out ${cwd}/tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done +restore where=${cwd}/tmp/bacula-restores select all storage=tape done yes wait messages @@ -63,7 +63,7 @@ quit END_OF_DATA run_bacula -check_for_zombie_jobs storage=DDS-4 +check_for_zombie_jobs storage=tape stop_bacula check_two_logs diff --git a/regress/tests/scratchpool-pool-test b/regress/tests/scratchpool-pool-test index 814f6eef64..194a19eb6f 100755 --- a/regress/tests/scratchpool-pool-test +++ b/regress/tests/scratchpool-pool-test @@ -37,9 +37,9 @@ cat <${cwd}/tmp/bconcmds @$out /dev/null messages @$out ${cwd}/tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=1 pool=SpecialScratch drive=0 -label storage=DDS-4 volume=TestVolume002 slot=2 pool=SpecialScratch drive=0 -label storage=DDS-4 volume=TestVolume003 slot=3 pool=Scratch drive=0 +label storage=tape volume=TestVolume001 slot=1 pool=SpecialScratch drive=0 +label storage=tape volume=TestVolume002 slot=2 pool=SpecialScratch drive=0 +label storage=tape volume=TestVolume003 slot=3 pool=Scratch drive=0 show pool=Default show pool=Special @######################## @@ -71,7 +71,7 @@ list volume pool=Special @# now do a restore @# @$out ${cwd}/tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done +restore where=${cwd}/tmp/bacula-restores select all storage=tape done yes wait messages @@ -79,7 +79,7 @@ quit END_OF_DATA run_bacula -check_for_zombie_jobs storage=DDS-4 +check_for_zombie_jobs storage=tape stop_bacula check_two_logs diff --git a/regress/tests/small-file-size-tape b/regress/tests/small-file-size-tape index dc0dc89561..2e1dc65e1d 100755 --- a/regress/tests/small-file-size-tape +++ b/regress/tests/small-file-size-tape @@ -23,8 +23,8 @@ cat <${cwd}/tmp/bconcmds @$out /dev/null messages @$out ${cwd}/tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default -setdebug level=2 storage=DDS-4 +label storage=tape volume=TestVolume001 slot=0 pool=Default +setdebug level=2 storage=tape run job=$JobName yes wait messages @@ -32,7 +32,7 @@ messages @# now do a restore @# @$out ${cwd}/tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select storage=DDS-4 +restore where=${cwd}/tmp/bacula-restores select storage=tape unmark * mark * done @@ -43,7 +43,7 @@ quit END_OF_DATA run_bacula -check_for_zombie_jobs storage=DDS-4 +check_for_zombie_jobs storage=tape stop_bacula check_two_logs diff --git a/regress/tests/three-pool-recycle-test b/regress/tests/three-pool-recycle-test index 657c373201..2a145a1211 100755 --- a/regress/tests/three-pool-recycle-test +++ b/regress/tests/three-pool-recycle-test @@ -31,10 +31,10 @@ cat <${cwd}/tmp/bconcmds @$out /dev/null messages @$out ${cwd}/tmp/log1.out -@#setdebug level=150 storage=DDS-4 -label storage=DDS-4 volume=TestVolume001 slot=1 pool=Full drive=0 -label storage=DDS-4 volume=TestVolume002 slot=2 pool=Default drive=0 -label storage=DDS-4 volume=TestVolume003 slot=3 pool=Scratch drive=0 +@#setdebug level=150 storage=tape +label storage=tape volume=TestVolume001 slot=1 pool=Full drive=0 +label storage=tape volume=TestVolume002 slot=2 pool=Default drive=0 +label storage=tape volume=TestVolume003 slot=3 pool=Scratch drive=0 update Volume=TestVolume001 maxvoljobs=1 update Volume=TestVolume002 maxvoljobs=1 update Volume=TestVolume003 volretention=7s @@ -80,7 +80,7 @@ messages list volumes @# should recycle Scratch pool run job=NightlySave2 level=Full pool=Full yes -status storage=DDS-4 +status storage=tape messages wait list volumes @@ -89,7 +89,7 @@ messages @# now do a restore @# @$out ${cwd}/tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done +restore where=${cwd}/tmp/bacula-restores select all storage=tape done yes wait messages @@ -97,7 +97,7 @@ quit END_OF_DATA run_bacula -check_for_zombie_jobs storage=DDS-4 +check_for_zombie_jobs storage=tape stop_bacula check_two_logs diff --git a/regress/tests/three-pool-test b/regress/tests/three-pool-test index 7a86a9d0d4..08cefc05d8 100755 --- a/regress/tests/three-pool-test +++ b/regress/tests/three-pool-test @@ -33,24 +33,24 @@ cat <${cwd}/tmp/bconcmds @$out /dev/null messages @$out ${cwd}/tmp/log1.out -@#setdebug level=200 storage=DDS-4 +@#setdebug level=200 storage=tape @#setdebug level=200 client=$CLIENT -label storage=DDS-4 volume=TestVolume001 slot=1 Pool=Default drive=0 -label storage=DDS-4 volume=TestVolume002 slot=2 Pool=Full drive=0 -label storage=DDS-4 volume=TestVolume003 slot=3 Pool=Inc drive=1 -status storage=DDS-4 +label storage=tape volume=TestVolume001 slot=1 Pool=Default drive=0 +label storage=tape volume=TestVolume002 slot=2 Pool=Full drive=0 +label storage=tape volume=TestVolume003 slot=3 Pool=Inc drive=1 +status storage=tape run job=$JobName level=Full Pool=Default yes run job=$JobName level=Full Pool=Default yes run job=$JobName level=Full Pool=Default yes run job=$JobName level=Full Pool=Default yes run job=$JobName level=Full Pool=Default yes @sleep 10 -status storage=DDS-4 +status storage=tape list volumes wait list volumes list jobs -status storage=DDS-4 +status storage=tape messages quit END_OF_DATA @@ -65,7 +65,7 @@ messages @# now do a restore @# @$out ${cwd}/tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done +restore where=${cwd}/tmp/bacula-restores select all storage=tape done yes wait messages @@ -74,7 +74,7 @@ END_OF_DATA run_bconsole -check_for_zombie_jobs storage=DDS-4 +check_for_zombie_jobs storage=tape stop_bacula check_two_logs diff --git a/regress/tests/truncate-bug-tape b/regress/tests/truncate-bug-tape index 382692cacf..3979c87cc4 100755 --- a/regress/tests/truncate-bug-tape +++ b/regress/tests/truncate-bug-tape @@ -20,10 +20,10 @@ cat <tmp/bconcmds @$out /dev/null messages @$out tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default +label storage=tape volume=TestVolume001 slot=0 pool=Default @# do a bunch of saves so we have 12 files on the tape @#setdebug level=100 dir -setdebug level=100 storage=DDS-4 +setdebug level=100 storage=tape run job=$JobName yes run level=Full job=$JobName yes run level=Full job=$JobName yes @@ -42,7 +42,7 @@ quit END_OF_DATA run_bacula -scripts/check_for_zombie_jobs storage=DDS-4 +scripts/check_for_zombie_jobs storage=tape cat <tmp/bconcmds @$out /dev/null @@ -51,7 +51,7 @@ messages @# @# now do a restore @# -restore where=${cwd}/tmp/bacula-restores storage=DDS-4 +restore where=${cwd}/tmp/bacula-restores storage=tape 3 @# select JobId=4 (i.e. file five on the tape) 4 @@ -66,7 +66,7 @@ quit END_OF_DATA run_bconsole -scripts/check_for_zombie_jobs storage=DDS-4 +scripts/check_for_zombie_jobs storage=tape # Now write to tape one more time cat <tmp/bconcmds @@ -80,7 +80,7 @@ quit END_OF_DATA run_bconsole -check_for_zombie_jobs storage=DDS-4 +check_for_zombie_jobs storage=tape stop_bacula check_two_logs diff --git a/regress/tests/two-pool-changer b/regress/tests/two-pool-changer index c48d66ff78..d121c0be02 100755 --- a/regress/tests/two-pool-changer +++ b/regress/tests/two-pool-changer @@ -34,8 +34,8 @@ cat <tmp/bconcmds @$out /dev/null messages @$out tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=$SLOT1 pool=Full drive=$DRIVE1 -label storage=DDS-4 volume=TestVolume002 slot=$SLOT2 pool=Default drive=$DRIVE1 +label storage=tape volume=TestVolume001 slot=$SLOT1 pool=Full drive=$DRIVE1 +label storage=tape volume=TestVolume002 slot=$SLOT2 pool=Default drive=$DRIVE1 list volumes @# Start job with Client run before and sleep run job=NightlySave1 level=Full pool=Default yes @@ -43,12 +43,12 @@ run job=NightlySave1 level=Full pool=Default yes #run job=NightlySave1 level=Full pool=Default yes @# wait between starting jobs @sleep 60 -setdebug level=190 storage=DDS-4 +setdebug level=190 storage=tape 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 -status storage=DDS-4 +status storage=tape messages wait list volumes @@ -57,7 +57,7 @@ messages @# now do a restore @# @$out tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done +restore where=${cwd}/tmp/bacula-restores select all storage=tape done yes wait messages @@ -65,7 +65,7 @@ quit END_OF_DATA run_bacula -check_for_zombie_jobs storage=DDS-4 +check_for_zombie_jobs storage=tape stop_bacula check_two_logs diff --git a/regress/tests/two-pool-test b/regress/tests/two-pool-test index bc154bc6fb..e54a3a0882 100755 --- a/regress/tests/two-pool-test +++ b/regress/tests/two-pool-test @@ -31,16 +31,16 @@ cat <tmp/bconcmds @$out /dev/null messages @$out tmp/log1.out -setdebug level=150 storage=DDS-4 -label storage=DDS-4 volume=TestVolume001 slot=1 pool=Full drive=0 -label storage=DDS-4 volume=TestVolume002 slot=2 pool=Default drive=0 +setdebug level=150 storage=tape +label storage=tape volume=TestVolume001 slot=1 pool=Full drive=0 +label storage=tape volume=TestVolume002 slot=2 pool=Default drive=0 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 @# wait between starting jobs @sleep 30 -@#setdebug level=100 storage=DDS-4 +@#setdebug level=100 storage=tape run job=NightlySave2 level=Full pool=Full yes run job=NightlySave2 level=Full pool=Full yes @sleep 10 @@ -48,7 +48,7 @@ messages @sleep 10 messages @sleep 10 -status storage=DDS-4 +status storage=tape messages wait list volumes @@ -57,9 +57,9 @@ 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 +release storage=tape drive=0 +release storage=tape drive=1 +restore where=${cwd}/tmp/bacula-restores select all storage=tape done yes wait messages @@ -67,7 +67,7 @@ quit END_OF_DATA run_bacula -check_for_zombie_jobs storage=DDS-4 +check_for_zombie_jobs storage=tape stop_bacula check_two_logs diff --git a/regress/tests/two-volume-changer b/regress/tests/two-volume-changer index 49cbb036b4..5e3462570a 100755 --- a/regress/tests/two-volume-changer +++ b/regress/tests/two-volume-changer @@ -31,15 +31,15 @@ cat <tmp/bconcmds @$out /dev/null messages @$out tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=$SLOT1 pool=Default drive=$DRIVE1 -label storage=DDS-4 volume=TestVolume002 slot=$SLOT2 pool=Default drive=$DRIVE1 +label storage=tape volume=TestVolume001 slot=$SLOT1 pool=Default drive=$DRIVE1 +label storage=tape volume=TestVolume002 slot=$SLOT2 pool=Default drive=$DRIVE1 update Volume=TestVolume002 MaxVolBytes=3000000 pool=Default drive=$DRIVE1 sql select * from Storage; select VolumeName,InChanger,Slot,StorageId from Media; @#setdebug level=1000 client=$CLIENT -setdebug level=150 storage=DDS-4 +setdebug level=150 storage=tape run job=$JobName yes wait sql @@ -51,7 +51,7 @@ quit END_OF_DATA run_bacula -check_for_zombie_jobs storage=DDS-4 +check_for_zombie_jobs storage=tape stop_bacula $scripts/${AUTOCHANGER_SCRIPT} ${AUTOCHANGER} unload $SLOT2 ${TAPE_DRIVE} 0 @@ -63,7 +63,7 @@ messages @# now do a restore @# @$out tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done +restore where=${cwd}/tmp/bacula-restores select all storage=tape done yes wait messages @@ -71,7 +71,7 @@ quit END_OF_DATA run_bacula -check_for_zombie_jobs storage=DDS-4 +check_for_zombie_jobs storage=tape stop_bacula check_two_logs diff --git a/regress/tests/two-volume-test b/regress/tests/two-volume-test index f14f999b26..00ced3b4a1 100755 --- a/regress/tests/two-volume-test +++ b/regress/tests/two-volume-test @@ -31,8 +31,8 @@ cat <tmp/bconcmds @$out /dev/null messages @$out tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=1 pool=Default drive=0 -label storage=DDS-4 volume=TestVolume002 slot=2 pool=Default drive=0 +label storage=tape volume=TestVolume001 slot=1 pool=Default drive=0 +label storage=tape volume=TestVolume002 slot=2 pool=Default drive=0 update Volume=TestVolume001 MaxVolBytes=3000000 pool=Default drive=0 sql select * from Storage; @@ -41,7 +41,7 @@ select VolumeName,InChanger,StorageId from Media; @#setdebug level=1000 client=$CLIENT run job=$JobName yes wait -update slots scan storage=DDS-4 +update slots scan storage=tape sql select * from Storage; select VolumeName,InChanger,StorageId from Media; @@ -51,7 +51,7 @@ messages @# now do a restore @# @$out tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done +restore where=${cwd}/tmp/bacula-restores select all storage=tape done yes wait messages @@ -59,7 +59,7 @@ quit END_OF_DATA run_bacula -check_for_zombie_jobs storage=DDS-4 +check_for_zombie_jobs storage=tape stop_bacula check_two_logs diff --git a/regress/tests/usr-tape-root b/regress/tests/usr-tape-root index b1e15726d2..86f8748ef4 100755 --- a/regress/tests/usr-tape-root +++ b/regress/tests/usr-tape-root @@ -19,7 +19,7 @@ cat < ${cwd}/tmp/bconcmds @$out /dev/null messages @$out tmp/log1.out -label storage=DDS-4 Volume=TestVolume001 slot=0 +label storage=tape Volume=TestVolume001 slot=0 run job=NightlySave yes wait messages diff --git a/regress/tests/verify-vol-tape b/regress/tests/verify-vol-tape index 261251511c..91ee840b3b 100755 --- a/regress/tests/verify-vol-tape +++ b/regress/tests/verify-vol-tape @@ -21,8 +21,8 @@ cat <tmp/bconcmds @$out /dev/null messages @$out tmp/log1.out -setdebug level=1 storage=DDS-4 sd -label storage=DDS-4 volume=TestVolume001 pool=Default +setdebug level=1 storage=tape sd +label storage=tape volume=TestVolume001 pool=Default run job=$JobName yes wait messages @@ -40,7 +40,7 @@ END_OF_DATA run_bacula sleep 2 -check_for_zombie_jobs storage=DDS-4 +check_for_zombie_jobs storage=tape stop_bacula grep "^ Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null diff --git a/regress/tests/vol-duration-changer b/regress/tests/vol-duration-changer index e7ff5e0ff9..a27a6c75d8 100755 --- a/regress/tests/vol-duration-changer +++ b/regress/tests/vol-duration-changer @@ -29,14 +29,14 @@ cat <${cwd}/tmp/bconcmds @$out /dev/null messages @$out ${cwd}/tmp/log1.out -setdebug level=100 storage=DDS-4 -label storage=DDS-4 volume=TestVolume001 slot=$SLOT1 pool=Default drive=$DRIVE1 -label storage=DDS-4 volume=TestVolume002 slot=$SLOT2 Pool=Default drive=$DRIVE1 +setdebug level=100 storage=tape +label storage=tape volume=TestVolume001 slot=$SLOT1 pool=Default drive=$DRIVE1 +label storage=tape volume=TestVolume002 slot=$SLOT2 Pool=Default drive=$DRIVE1 update Volume=TestVolume001 VolUse=30 update Volume=TestVolume002 VolUse=30 -run job=$JobName level=Full Storage=DDS-4 yes +run job=$JobName level=Full Storage=tape yes @sleep 31 -run job=$JobName level=Full Storage=DDS-4 yes +run job=$JobName level=Full Storage=tape yes wait messages list volumes @@ -44,7 +44,7 @@ list volumes @# now do a restore @# @$out ${cwd}/tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select storage=DDS-4 +restore where=${cwd}/tmp/bacula-restores select storage=tape unmark * mark * done @@ -55,7 +55,7 @@ quit END_OF_DATA run_bacula -check_for_zombie_jobs storage=DDS-4 +check_for_zombie_jobs storage=tape stop_bacula check_two_logs diff --git a/regress/tests/win32-backup-tape b/regress/tests/win32-backup-tape index 6b9b7c0626..ca27fd5006 100755 --- a/regress/tests/win32-backup-tape +++ b/regress/tests/win32-backup-tape @@ -22,10 +22,10 @@ cat <tmp/bconcmds @$out /dev/null messages @$out tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default drive=0 +label storage=tape volume=TestVolume001 slot=0 pool=Default drive=0 run job=$JobName yes @sleep 10 -status storage=DDS-4 +status storage=tape @sleep 30 messages wait @@ -34,14 +34,14 @@ messages @# now do a restore @# @$out tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done +restore where=${cwd}/tmp/bacula-restores select all storage=tape done yes wait messages END_OF_DATA run_bacula -check_for_zombie_jobs storage=DDS-4 +check_for_zombie_jobs storage=tape stop_bacula check_two_logs diff --git a/regress/tests/win32-to-linux-tape b/regress/tests/win32-to-linux-tape index 1ba47eee2e..743945f4a7 100755 --- a/regress/tests/win32-to-linux-tape +++ b/regress/tests/win32-to-linux-tape @@ -22,10 +22,10 @@ cat <tmp/bconcmds @$out /dev/null messages @$out tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default drive=0 +label storage=tape volume=TestVolume001 slot=0 pool=Default drive=0 run job=NightlySave yes @sleep 10 -status storage=DDS-4 +status storage=tape @sleep 30 messages wait @@ -34,14 +34,14 @@ messages @# now do a restore @# @$out tmp/log2.out -restore where=${cwd}/tmp/bacula-restores client=Tibs select all storage=DDS-4 done +restore where=${cwd}/tmp/bacula-restores client=Tibs select all storage=tape done yes wait messages END_OF_DATA run_bacula -check_for_zombie_jobs storage=DDS-4 +check_for_zombie_jobs storage=tape stop_bacula check_two_logs