unlock_reservations();
if (stat == 1) {
DCR *new_dcr = jcr->read_dcr;
- dev->unblock();
+ dev->unblock(dev_unlocked);
detach_dcr_from_dev(dcr); /* release old device */
/* Copy important info from the new dcr */
dev = dcr->dev = new_dcr->dev;
dcr->VolumeName, dev->print_name());
get_out:
- P(dev->mutex);
+ dev->dlock();
if (dcr->reserved_device) {
dev->reserved_device--;
Dmsg2(100, "Dec reserve=%d dev=%s\n", dev->reserved_device, dev->print_name());
dcr->reserved_device = false;
}
- V(dev->mutex);
- dev->unblock();
+ dev->unblock(dev_locked);
Dmsg1(50, "jcr->dcr=%p\n", jcr->dcr);
return ok;
}
dcr->VolumeName);
/* Release volume reserved by dir_find_next_appendable_volume() */
if (dcr->VolumeName[0]) {
- free_unused_volume(dcr);
+ volume_unused(dcr);
}
if (dev->num_writers != 0) {
Jmsg3(jcr, M_FATAL, 0, _("Wanted to append to Volume \"%s\", but device %s is busy writing on \"%s\" .\n"),
if (dev->num_writers == 0) {
memcpy(&dev->VolCatInfo, &dcr->VolCatInfo, sizeof(dev->VolCatInfo));
}
+
+ /*
+ * Insanity check
+ *
+ * Check to see if the tape position as defined by the OS is
+ * the same as our concept. If it is not, we bail out, because
+ * it means the user has probably manually rewound the tape.
+ * Note, we check only if num_writers == 0, but this code will
+ * also work fine for any number of writers. If num_writers > 0,
+ * we probably should cancel all jobs using this device, or
+ * perhaps even abort the SD, or at a minimum, mark the tape
+ * in error. Another strategy with num_writers == 0, would be
+ * to rewind the tape and do a new eod() request.
+ */
+ if (dev->is_tape() && dev->num_writers == 0) {
+ int32_t file = dev->get_os_tape_file();
+ if (file >= 0 && file != (int32_t)dev->get_file()) {
+ Jmsg(jcr, M_FATAL, 0, _("Invalid tape position on volume \"%s\""
+ " on device %s. Expected %d, got %d\n"),
+ dev->VolHdr.VolumeName, dev->print_name(), dev->get_file(), file);
+ goto get_out;
+ }
+ }
}
} else {
/* Not already in append mode, so mount the device */
}
dev->VolCatInfo.VolCatJobs++; /* increment number of jobs on vol */
dir_update_volume_info(dcr, false); /* send Volume info to Director */
- P(dev->mutex);
+ dev->dlock();
if (dcr->reserved_device) {
dev->reserved_device--;
Dmsg2(100, "Dec reserve=%d dev=%s\n", dev->reserved_device, dev->print_name());
dcr->reserved_device = false;
}
- V(dev->mutex);
- dev->unblock();
+ dev->unblock(dev_locked);
return dcr;
/*
* Error return
*/
get_out:
- P(dev->mutex);
+ dev->dlock();
if (dcr->reserved_device) {
dev->reserved_device--;
Dmsg2(100, "Dec reserve=%d dev=%s\n", dev->reserved_device, dev->print_name());
dcr->reserved_device = false;
}
- V(dev->mutex);
- dev->unblock();
+ dev->unblock(dev_locked);
return NULL;
}
/* lock only if not already locked by this thread */
if (!dcr->dev_locked) {
- lock_device(dev);
+ dev->r_dlock();
}
Dmsg2(100, "release_device device %s is %s\n", dev->print_name(), dev->is_tape()?"tape":"disk");
if (status != 0) {
berrno be;
Jmsg(jcr, M_ALERT, 0, _("3997 Bad alert command: %s: ERR=%s.\n"),
- alert, be.strerror(status));
+ alert, be.bstrerror(status));
}
Dmsg1(400, "alert status=%d\n", status);
free_pool_memory(alert);
}
+ pthread_cond_broadcast(&dev->wait_next_vol);
+ Dmsg1(100, "JobId=%u broadcast wait_device_release\n", (uint32_t)jcr->JobId);
+ pthread_cond_broadcast(&wait_device_release);
dcr->dev_locked = false; /* set no longer locked */
- unlock_device(dev);
+ dev->dunlock();
if (jcr->read_dcr == dcr) {
jcr->read_dcr = NULL;
}
jcr->dcr = NULL;
}
free_dcr(dcr);
+ Dmsg2(100, "===== Device %s released by JobId=%u\n", dev->print_name(),
+ (uint32_t)jcr->JobId);
return ok;
}
*/
DCR *new_dcr(JCR *jcr, DEVICE *dev)
{
+ if (jcr) Dmsg2(100, "enter new_dcr JobId=%u dev=%p\n", (uint32_t)jcr->JobId, dev);
DCR *dcr = (DCR *)malloc(sizeof(DCR));
memset(dcr, 0, sizeof(DCR));
dcr->jcr = jcr;
if (dev) {
+ dcr->tid = pthread_self();
dcr->dev = dev;
dcr->device = dev->device;
dcr->block = new_block(dev);
DEVICE *dev = dcr->dev;
JCR *jcr = dcr->jcr;
- if (!dcr->attached_to_dev && dev->is_open() && jcr && jcr->JobType != JT_SYSTEM) {
+ if (jcr) Dmsg1(500, "JobId=%u enter attach_dcr_to_dev\n", (uint32_t)jcr->JobId);
+ if (!dcr->attached_to_dev && dev->initiated && jcr && jcr->JobType != JT_SYSTEM) {
dev->attached_dcrs->append(dcr); /* attach dcr to device */
dcr->attached_to_dev = true;
+ Dmsg1(500, "JobId=%u attach_dcr_to_dev\n", (uint32_t)jcr->JobId);
}
}
void detach_dcr_from_dev(DCR *dcr)
{
- DEVICE *dev = dcr->dev;
-
- if (dcr->reserved_device) {
- dcr->reserved_device = false;
- lock_device(dev);
- dev->reserved_device--;
- Dmsg2(100, "Dec reserve=%d dev=%s\n", dev->reserved_device, dev->print_name());
- dcr->reserved_device = false;
- /* If we set read mode in reserving, remove it */
- if (dev->can_read()) {
- dev->clear_read();
- }
- if (dev->num_writers < 0) {
- Jmsg1(dcr->jcr, M_ERROR, 0, _("Hey! num_writers=%d!!!!\n"), dev->num_writers);
- dev->num_writers = 0;
- }
- unlock_device(dev);
- }
+ Dmsg1(500, "JobId=%u enter detach_dcr_from_dev\n", (uint32_t)dcr->jcr->JobId);
+ unreserve_device(dcr);
/* Detach this dcr only if attached */
if (dcr->attached_to_dev) {
dcr->attached_to_dev = false;
// remove_dcr_from_dcrs(dcr); /* remove dcr from jcr list */
}
- free_unused_volume(dcr); /* free unused vols attached to this dcr */
- pthread_cond_broadcast(&dcr->dev->wait_next_vol);
- pthread_cond_broadcast(&wait_device_release);
}
/*
projects / bacula / bacula / blobdiff