int vol_label_status;
int retry = 0;
- Dmsg1(50, "jcr->dcr=%p\n", jcr->dcr);
+ Dmsg1(950, "jcr->dcr=%p\n", jcr->dcr);
dev->dblock(BST_DOING_ACQUIRE);
if (dev->num_writers > 0) {
* same as the current drive, we attempt to find the same
* device that was used to write the orginal volume. If
* found, we switch to using that device.
+ *
+ * N.B. A lot of routines rely on the dcr pointer not changing
+ * read_records.c even has multiple dcrs cached, so we take care
+ * here to release all important parts of the dcr and re-acquire
+ * them such as the block pointer (size may change), but we do
+ * not release the dcr.
*/
Dmsg2(50, "MediaType dcr=%s dev=%s\n", dcr->media_type, dev->device->media_type);
if (dcr->media_type[0] && strcmp(dcr->media_type, dev->device->media_type) != 0) {
RCTX rctx;
DIRSTORE *store;
int stat;
- DCR *dcr_save = jcr->dcr;
Jmsg3(jcr, M_INFO, 0, _("Changing device. Want Media Type=\"%s\" have=\"%s\"\n"
" device=%s\n"),
dcr->media_type, dev->device->media_type, dev->print_name());
+ Dmsg3(50, "Changing device. Want Media Type=\"%s\" have=\"%s\"\n"
+ " device=%s\n",
+ dcr->media_type, dev->device->media_type, dev->print_name());
+
+ dev->dunblock(DEV_UNLOCKED);
+
lock_reservations();
- jcr->dcr = NULL;
memset(&rctx, 0, sizeof(RCTX));
rctx.jcr = jcr;
jcr->reserve_msgs = New(alist(10, not_owned_by_alist));
bstrncpy(store->pool_type, dcr->pool_type, sizeof(store->pool_type));
store->append = false;
rctx.store = store;
+ dcr->keep_dcr = true; /* do not free the dcr */
+ release_device(dcr);
+ dcr->keep_dcr = false;
/*
- * Note, if search_for_device() succeeds, we get a new dcr,
- * which we do not use except for the dev info.
+ * Search for a new device
*/
stat = search_res_for_device(rctx);
release_reserve_messages(jcr); /* release queued messages */
unlock_reservations();
+
if (stat == 1) {
- DCR *ndcr = jcr->read_dcr;
- dev->dunblock(dev_unlocked);
- detach_dcr_from_dev(dcr); /* release old device */
- /* Copy important info from the new dcr */
- dev = dcr->dev = ndcr->dev;
- jcr->read_dcr = dcr;
- dcr->device = ndcr->device;
- dcr->max_job_spool_size = dcr->device->max_job_spool_size;
- attach_dcr_to_dev(dcr);
- ndcr->VolumeName[0] = 0;
- free_dcr(ndcr);
+ dev = dcr->dev; /* get new device pointer */
dev->dblock(BST_DOING_ACQUIRE);
+ dcr->VolumeName[0] = 0;
Jmsg(jcr, M_INFO, 0, _("Media Type change. New device %s chosen.\n"),
dev->print_name());
+ Dmsg1(50, "Media Type change. New device %s chosen.\n", dev->print_name());
+
bstrncpy(dcr->VolumeName, vol->VolumeName, sizeof(dcr->VolumeName));
bstrncpy(dcr->media_type, vol->MediaType, sizeof(dcr->media_type));
dcr->VolCatInfo.Slot = vol->Slot;
bstrncpy(dcr->pool_name, store->pool_name, sizeof(dcr->pool_name));
bstrncpy(dcr->pool_type, store->pool_type, sizeof(dcr->pool_type));
- } else if (stat == 0) { /* device busy */
- Pmsg1(000, "Device %s is busy.\n", vol->device);
} else {
/* error */
Jmsg1(jcr, M_FATAL, 0, _("No suitable device found to read Volume \"%s\"\n"),
vol->VolumeName);
- jcr->dcr = dcr_save;
+ Dmsg1(50, "No suitable device found to read Volume \"%s\"\n", vol->VolumeName);
goto get_out;
}
- jcr->dcr = dcr_save;
}
dev->print_name(), dcr->VolumeName, dev->bstrerror());
goto default_path;
}
- Dmsg1(100, "opened dev %s OK\n", dev->print_name());
+ Dmsg1(50, "opened dev %s OK\n", dev->print_name());
/* Read Volume Label */
-
- Dmsg0(200, "calling read-vol-label\n");
+ Dmsg0(50, "calling read-vol-label\n");
vol_label_status = read_dev_volume_label(dcr);
switch (vol_label_status) {
case VOL_OK:
get_out:
dev->dlock();
- if (dcr->reserved_device) {
+ if (dcr && dcr->reserved_device) {
dev->reserved_device--;
- Dmsg2(100, "Dec reserve=%d dev=%s\n", dev->reserved_device, dev->print_name());
+ Dmsg2(50, "Dec reserve=%d dev=%s\n", dev->reserved_device, dev->print_name());
dcr->reserved_device = false;
}
- dev->dunblock(dev_locked);
- Dmsg1(50, "jcr->dcr=%p\n", jcr->dcr);
+ dev->dunblock(DEV_LOCKED);
+ Dmsg1(950, "jcr->dcr=%p\n", jcr->dcr);
return ok;
}
Dmsg2(100, "Dec reserve=%d dev=%s\n", dev->reserved_device, dev->print_name());
dcr->reserved_device = false;
}
- dev->dunblock(dev_locked);
+ dev->dunblock(DEV_LOCKED);
return dcr;
/*
Dmsg2(100, "Dec reserve=%d dev=%s\n", dev->reserved_device, dev->print_name());
dcr->reserved_device = false;
}
- dev->dunblock(dev_locked);
+ dev->dunblock(DEV_LOCKED);
return NULL;
}
bool ok = true;
/* lock only if not already locked by this thread */
- if (!dcr->dev_locked) {
+ if (!dcr->is_dev_locked()) {
dev->r_dlock();
}
Dmsg2(100, "release_device device %s is %s\n", dev->print_name(), dev->is_tape()?"tape":"disk");
Dmsg1(100, "JobId=%u broadcast wait_device_release\n", (uint32_t)jcr->JobId);
pthread_cond_broadcast(&wait_device_release);
dev->dunlock();
- if (jcr->read_dcr == dcr) {
- jcr->read_dcr = NULL;
- }
- if (jcr->dcr == dcr) {
- jcr->dcr = NULL;
+ if (dcr->keep_dcr) {
+ detach_dcr_from_dev(dcr);
+ } else {
+ if (jcr->read_dcr == dcr) {
+ jcr->read_dcr = NULL;
+ }
+ if (jcr->dcr == dcr) {
+ jcr->dcr = NULL;
+ }
+ free_dcr(dcr);
}
- free_dcr(dcr);
Dmsg2(100, "===== Device %s released by JobId=%u\n", dev->print_name(),
(uint32_t)jcr->JobId);
return ok;
* Search the dcrs list for the given dcr. If it is found,
* as it should be, then remove it. Also zap the jcr pointer
* to the dcr if it is the same one.
+ *
+ * Note, this code will be turned on when we can write to multiple
+ * dcrs at the same time.
*/
#ifdef needed
static void remove_dcr_from_dcrs(DCR *dcr)
void detach_dcr_from_dev(DCR *dcr)
{
+ DEVICE *dev = dcr->dev;
Dmsg1(500, "JobId=%u enter detach_dcr_from_dev\n", (uint32_t)dcr->jcr->JobId);
/* Detach this dcr only if attached */
- if (dcr->attached_to_dev && dcr->dev) {
+ if (dcr->attached_to_dev && dev) {
+ dev->dlock();
unreserve_device(dcr);
dcr->dev->attached_dcrs->remove(dcr); /* detach dcr from device */
dcr->attached_to_dev = false;
// remove_dcr_from_dcrs(dcr); /* remove dcr from jcr list */
+ dev->dunlock();
}
}
projects / bacula / bacula / blobdiff