Fix incorrect patch merged with WIP work

diff --git a/bacula/src/stored/acquire.c b/bacula/src/stored/acquire.c
index ddc461ba1a9d0ad3eb9fedb158f91eecc69d3729..9421df907405c2778bc56085f9dfe40841050566 100644 (file)
--- a/bacula/src/stored/acquire.c
+++ b/bacula/src/stored/acquire.c
@@ -484,7 +484,6 @@ bool release_device(DCR *dcr)
    bool ok = true;
    char tbuf[100];
    bsteal_lock_t holder;
-   bool read_dev;
 
    dev->Lock();
    if (!obtain_device_block(dev,
@@ -500,8 +499,7 @@ bool release_device(DCR *dcr)
    /* if device is reserved, job never started, so release the reserve here */
    dcr->clear_reserved();
 
-   read_dev = dev->can_read();
-   if (read_dev) {
+   if (dev->can_read()) {
       VOLUME_CAT_INFO *vol = &dev->VolCatInfo;
       generate_plugin_event(jcr, bsdEventDeviceClose, dcr);
       dev->clear_read();              /* clear read bit */
@@ -604,9 +602,6 @@ bool release_device(DCR *dcr)
       dev->detach_dcr_from_dev(dcr);
    } else {
       free_dcr(dcr);
-      if (read_dev) {
-         dev->term(NULL);
-      }
    }
    Dmsg2(100, "Device %s released by JobId=%u\n", dev->print_name(),
          (uint32_t)jcr->JobId);

diff --git a/bacula/src/stored/reserve.c b/bacula/src/stored/reserve.c
index b874dee736b9c533347077c59ade5dde983091b2..e85e58bd6929a481c2d80aa882d5effc21e9c352 100644 (file)
--- a/bacula/src/stored/reserve.c
+++ b/bacula/src/stored/reserve.c
@@ -763,8 +763,7 @@ static int reserve_device(RCTX &rctx)
    if (rctx.store->append) {
       dcr = new_dcr(rctx.jcr, rctx.jcr->dcr, rctx.device->dev, SD_APPEND);
    } else {
-      DEVICE *dev = init_dev(rctx.jcr, rctx.device, /*adata*/false, /*statcollector*/0x0, /*clone*/true);
-      dcr = new_dcr(rctx.jcr, rctx.jcr->read_dcr, dev, SD_READ);
+      dcr = new_dcr(rctx.jcr, rctx.jcr->read_dcr, rctx.device->dev, SD_READ);
    }
    if (!dcr) {
       BSOCK *dir = rctx.jcr->dir_bsock;

diff --git a/regress/tests/copy-volume-test b/regress/tests/copy-volume-test
index 63772fa2aaa97a4f702417fbed9fc0436d76920a..fe632ebf33f79b2c7b9abbe56b54cf0aa0626138 100755 (executable)
--- a/regress/tests/copy-volume-test
+++ b/regress/tests/copy-volume-test
@@ -48,9 +48,7 @@ update Volume=FileVolume001 MaxVolBytes=3000000 pool=Default
 label storage=DiskChanger volume=ChangerVolume001 slot=1 Pool=Scratch drive=0
 label storage=DiskChanger volume=ChangerVolume002 slot=2 Pool=Scratch drive=0
 @# 
-run job=$JobName level=full yes
-wait
-run job=$JobName level=full yes
+run job=$JobName yes
 wait
 run job=$JobName yes
 wait

diff --git a/regress/tests/migration-jobspan-test b/regress/tests/migration-jobspan-test
index c86bce46e78fe59a1decf6684213c0a97b3bf4fb..3a05c3f1efee328c2cdf5c17d908d41d0e6ae994 100755 (executable)
--- a/regress/tests/migration-jobspan-test
+++ b/regress/tests/migration-jobspan-test
@@ -48,13 +48,13 @@ label storage=DiskChanger volume=ChangerVolume001 slot=1 Pool=Full drive=0
 label storage=DiskChanger volume=ChangerVolume002 slot=2 Pool=Full drive=0
 list volumes
 @#
-run job=$JobName level=full yes
+run job=$JobName yes
 @#run job=$JobName yes
 wait
 list volumes
 @#setdebug level=200 dir
 @# should migrate both Volumes
-run job=migrate-job level=full yes
+run job=migrate-job yes
 wait
 purge volume=FileVolume001
 purge volume=FileVolume002
@@ -66,7 +66,7 @@ wait
 @# now do a restore
 @#
 @$out ${cwd}/tmp/log2.out
-@#setdebug level=500 storage=File
+setdebug level=500 storage=File
 restore where=${cwd}/tmp/bacula-restores select storage=DiskChanger
 unmark *
 mark *

diff --git a/regress/tests/migration-volume-test b/regress/tests/migration-volume-test
index bda73beae3afcb661f1486854c39d067d64dee87..cff1a93a52a083c7be20c59b75b95ac35e92aa08 100755 (executable)
--- a/regress/tests/migration-volume-test
+++ b/regress/tests/migration-volume-test
@@ -42,9 +42,9 @@ update Volume=FileVolume001 MaxVolBytes=3000000 pool=Default
 label storage=DiskChanger volume=ChangerVolume001 slot=1 Pool=Full drive=0
 label storage=DiskChanger volume=ChangerVolume002 slot=2 Pool=Full drive=0
 @# 
-run job=$JobName level=full yes
+run job=$JobName yes
 wait
-run job=$JobName level=full yes
+run job=$JobName yes
 wait
 update volume=FileVolume001 VolStatus=Used
 update volume=FileVolume002 VolStatus=Used