* Version $Id$
*/
/*
- Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker
+ Copyright (C) 2000-2003 Kern Sibbald and John Walker
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
*/
int acquire_device_for_read(JCR *jcr, DEVICE *dev, DEV_BLOCK *block)
{
- int stat;
+ int stat = 0;
+ int tape_previously_mounted;
+ VOL_LIST *vol;
- new_lock_device_state(dev, BST_DOING_ACQUIRE);
lock_device(dev);
- if (dev->state & ST_READ || dev->num_writers > 0) {
- Jmsg(jcr, M_FATAL, 0, _("Device %s is busy.\n"), dev_name(dev));
- new_unlock_device(dev);
- unlock_device(dev);
- return 0;
- }
- dev->state &= ~ST_LABEL; /* force reread of label */
block_device(dev, BST_DOING_ACQUIRE);
unlock_device(dev);
- stat = ready_dev_for_read(jcr, dev, block);
-#ifndef NEW_LOCK
+
+ tape_previously_mounted = (dev->state & ST_READ) || (dev->state & ST_APPEND);
+
+ if (dev->state & ST_READ || dev->num_writers > 0) {
+ Jmsg1(jcr, M_FATAL, 0, _("Device %s is busy. Job cancelled.\n"), dev_name(dev));
+ goto get_out;
+ }
+
+ /* Find next Volume, if any */
+ vol = jcr->VolList;
+ if (!vol) {
+ Jmsg(jcr, M_FATAL, 0, _("No volumes specified. Job cancelled.\n"));
+ goto get_out;
+ }
+ jcr->CurVolume++;
+ for (int i=1; i<jcr->CurVolume; i++) {
+ vol = vol->next;
+ }
+ pm_strcpy(&jcr->VolumeName, vol->VolumeName);
+
+ for (;;) {
+ if (job_cancelled(jcr)) {
+ Mmsg0(&dev->errmsg, _("Job cancelled.\n"));
+ goto get_out; /* error return */
+ }
+ /*
+ * This code ensures that the device is ready for
+ * reading. If it is a file, it opens it.
+ * If it is a tape, it checks the volume name
+ */
+ for ( ; !(dev->state & ST_OPENED); ) {
+ Dmsg1(120, "bstored: open vol=%s\n", jcr->VolumeName);
+ if (open_dev(dev, jcr->VolumeName, READ_ONLY) < 0) {
+ Jmsg(jcr, M_FATAL, 0, _("Open device %s volume %s failed, ERR=%s\n"),
+ dev_name(dev), jcr->VolumeName, strerror_dev(dev));
+ goto get_out;
+ }
+ Dmsg1(129, "open_dev %s OK\n", dev_name(dev));
+ }
+ dev->state &= ~ST_LABEL; /* force reread of label */
+ Dmsg0(200, "calling read-vol-label\n");
+ switch (read_dev_volume_label(jcr, dev, block)) {
+ case VOL_OK:
+ break; /* got it */
+ case VOL_IO_ERROR:
+ /*
+ * Send error message generated by read_dev_volume_label()
+ * only we really had a tape mounted. This supresses superfluous
+ * error messages when nothing is mounted.
+ */
+ if (tape_previously_mounted) {
+ Jmsg1(jcr, M_WARNING, 0, "%s", jcr->errmsg);
+ }
+ goto default_path;
+ default:
+ Jmsg1(jcr, M_WARNING, 0, "%s", jcr->errmsg);
+default_path:
+ tape_previously_mounted = 0;
+ Dmsg0(200, "dir_get_volume_info\n");
+ if (!dir_get_volume_info(jcr, 0)) {
+ Jmsg1(jcr, M_WARNING, 0, "%s", jcr->errmsg);
+ }
+ Dmsg2(200, "calling autoload Vol=%s Slot=%d\n",
+ jcr->VolumeName, jcr->VolCatInfo.Slot);
+ if (autoload_device(jcr, dev, 0, NULL)) {
+ continue;
+ }
+ /* Mount a specific volume and no other */
+ Dmsg0(200, "calling dir_ask_sysop\n");
+ if (!dir_ask_sysop_to_mount_volume(jcr, dev)) {
+ goto get_out; /* error return */
+ }
+ continue; /* try reading again */
+ }
+ break;
+ }
+
+ dev->state |= ST_READ;
+ attach_jcr_to_device(dev, jcr); /* attach jcr to device */
+ stat = 1; /* good return */
+ if ((dev->state & ST_TAPE) && vol->start_file > 0) {
+ Dmsg1(200, "====== Got start_file = %d\n", vol->start_file);
+ Jmsg(jcr, M_INFO, 0, _("Forward spacing to file %d.\n"), vol->start_file);
+ fsf_dev(dev, vol->start_file);
+ }
+
+get_out:
P(dev->mutex);
unblock_device(dev);
V(dev->mutex);
-#endif
- new_unlock_device(dev);
return stat;
}
{
int release = 0;
int do_mount = 0;
+ int stat = 0;
- new_lock_device_state(dev, BST_DOING_ACQUIRE);
lock_device(dev);
+ block_device(dev, BST_DOING_ACQUIRE);
+ unlock_device(dev);
Dmsg1(190, "acquire_append device is %s\n", dev_is_tape(dev)?"tape":"disk");
* Device already in append mode
*
* Check if we have the right Volume mounted
- * OK if AnonVols and volume info OK
- * OK if next volume matches current volume
- * otherwise mount desired volume obtained from
+ * OK if current volume info OK
+ * OK if next volume matches current volume
+ * otherwise mount desired volume obtained from
* dir_find_next_appendable_volume
*/
strcpy(jcr->VolumeName, dev->VolHdr.VolName);
- if (((dev->capabilities & CAP_ANONVOLS) &&
- !dir_get_volume_info(jcr)) ||
- (!dir_find_next_appendable_volume(jcr) ||
- strcmp(dev->VolHdr.VolName, jcr->VolumeName) != 0)) { /* wrong tape mounted */
+ if (!dir_get_volume_info(jcr, 1) ||
+ !(dir_find_next_appendable_volume(jcr) &&
+ strcmp(dev->VolHdr.VolName, jcr->VolumeName) == 0)) { /* wrong tape mounted */
if (dev->num_writers != 0) {
- Jmsg(jcr, M_FATAL, 0, _("Device %s is busy writing with another Volume.\n"), dev_name(dev));
- unlock_device(dev);
- new_unlock_device(dev);
- return 0;
+ Jmsg(jcr, M_FATAL, 0, _("Device %s is busy writing on another Volume.\n"), dev_name(dev));
+ goto get_out;
}
/* Wrong tape mounted, release it, then fall through to get correct one */
release = 1;
/* Not already in append mode, so mount the device */
if (dev->state & ST_READ) {
Jmsg(jcr, M_FATAL, 0, _("Device %s is busy reading.\n"), dev_name(dev));
- unlock_device(dev);
- new_unlock_device(dev);
- return 0;
+ goto get_out;
}
ASSERT(dev->num_writers == 0);
do_mount = 1;
}
if (do_mount) {
- block_device(dev, BST_DOING_ACQUIRE);
- unlock_device(dev);
if (!mount_next_write_volume(jcr, dev, block, release)) {
Jmsg(jcr, M_FATAL, 0, _("Could not ready device %s for append.\n"),
dev_name(dev));
-#ifndef NEW_LOCK
- P(dev->mutex);
- unblock_device(dev);
- unlock_device(dev);
-#endif
- new_unlock_device(dev);
- return 0;
+ goto get_out;
}
-#ifndef NEW_LOCK
- P(dev->mutex);
- unblock_device(dev);
-#endif
}
dev->num_writers++;
if (dev->num_writers > 1) {
- Dmsg2(0, "Hey!!!! There are %d writers on device %s\n", dev->num_writers,
+ Dmsg2(100, "Hey!!!! There are %d writers on device %s\n", dev->num_writers,
dev_name(dev));
}
if (jcr->NumVolumes == 0) {
jcr->NumVolumes = 1;
}
attach_jcr_to_device(dev, jcr); /* attach jcr to device */
- unlock_device(dev);
- new_unlock_device(dev);
- return 1; /* got it */
+ stat = 1; /* good return */
+
+get_out:
+ P(dev->mutex);
+ unblock_device(dev);
+ V(dev->mutex);
+ return stat;
}
/*
* the device remains open.
*
*/
-int release_device(JCR *jcr, DEVICE *dev, DEV_BLOCK *block)
+int release_device(JCR *jcr, DEVICE *dev)
{
-#ifndef NEW_LOCK
- P(dev->mutex);
-#endif
- new_lock_device(dev);
+ lock_device(dev);
Dmsg1(100, "release_device device is %s\n", dev_is_tape(dev)?"tape":"disk");
if (dev->state & ST_READ) {
dev->state &= ~ST_READ; /* clear read bit */
} else if (dev->num_writers > 0) {
dev->num_writers--;
+ if (dev->state & ST_TAPE) {
+ jcr->EndBlock = dev->EndBlock;
+ jcr->EndFile = dev->EndFile;
+ Dmsg2(200, "Release device: EndFile=%u EndBlock=%u\n", jcr->EndFile, jcr->EndBlock);
+ } else {
+ jcr->EndBlock = (uint32_t)dev->file_addr;
+ jcr->EndFile = (uint32_t)(dev->file_addr >> 32);
+ }
Dmsg1(100, "There are %d writers in release_device\n", dev->num_writers);
if (dev->num_writers == 0) {
- weof_dev(dev, 1);
Dmsg0(100, "dir_create_jobmedia_record. Release\n");
dir_create_jobmedia_record(jcr);
+ weof_dev(dev, 1);
dev->VolCatInfo.VolCatFiles++; /* increment number of files */
+ dev->VolCatInfo.VolCatJobs++; /* increment number of jobs */
/* Note! do volume update before close, which zaps VolCatInfo */
- Dmsg0(100, "dir_update_vol_info. Release\n");
+ Dmsg0(200, "dir_update_vol_info. Release0\n");
dir_update_volume_info(jcr, &dev->VolCatInfo, 0); /* send Volume info to Director */
if (!dev_is_tape(dev) || !(dev->capabilities & CAP_ALWAYSOPEN)) {
} else {
Dmsg0(100, "dir_create_jobmedia_record. Release\n");
dir_create_jobmedia_record(jcr);
- Dmsg0(100, "dir_update_vol_info. Release\n");
+ Dmsg0(200, "dir_update_vol_info. Release1\n");
+ dev->VolCatInfo.VolCatJobs++; /* increment number of jobs */
dir_update_volume_info(jcr, &dev->VolCatInfo, 0); /* send Volume info to Director */
}
} else {
- Jmsg1(jcr, M_ERROR, 0, _("BAD ERROR: release_device %s not in use.\n"), dev_name(dev));
+ Jmsg2(jcr, M_ERROR, 0, _("BAD ERROR: release_device %s, Volume %s not in use.\n"),
+ dev_name(dev), NPRT(jcr->VolumeName));
}
detach_jcr_from_device(dev, jcr);
-#ifndef NEW_LOCK
- V(dev->mutex);
-#endif
- new_unlock_device(dev);
+ unlock_device(dev);
return 1;
}
-
-
-
-/*
- * This routine ensures that the device is ready for
- * reading. If it is a file, it opens it.
- * If it is a tape, it checks the volume name
- *
- * Returns 0 on failure
- * Returns 1 on success
- */
-int ready_dev_for_read(JCR *jcr, DEVICE *dev, DEV_BLOCK *block)
-{
- if (!(dev->state & ST_OPENED)) {
- Dmsg1(120, "bstored: open vol=%s\n", jcr->VolumeName);
- if (open_dev(dev, jcr->VolumeName, READ_ONLY) < 0) {
- Jmsg(jcr, M_FATAL, 0, _("Open device %s volume %s failed, ERR=%s\n"),
- dev_name(dev), jcr->VolumeName, strerror_dev(dev));
- return 0;
- }
- Dmsg1(129, "open_dev %s OK\n", dev_name(dev));
- }
-
- for (;;) {
- if (job_cancelled(jcr)) {
- Mmsg0(&dev->errmsg, _("Job cancelled.\n"));
- return 0;
- }
- if (!rewind_dev(dev)) {
- Jmsg2(jcr, M_WARNING, 0, _("Rewind error on device %s. ERR=%s\n"),
- dev_name(dev), strerror_dev(dev));
- }
- switch (read_dev_volume_label(jcr, dev, block)) {
- case VOL_OK:
- break; /* got it */
- default:
- /* Send error message generated by read_dev_volume_label() */
- Jmsg(jcr, M_WARNING, 0, "%s", jcr->errmsg);
- if (!rewind_dev(dev)) {
- Jmsg2(jcr, M_WARNING, 0, _("Rewind error on device %s. ERR=%s\n"),
- dev_name(dev), strerror_dev(dev));
- }
- /* Mount a specific volume and no other */
- if (!dir_ask_sysop_to_mount_volume(jcr, dev)) {
- return 0; /* error return */
- }
- continue; /* try reading again */
- }
- break;
- }
-
- dev->state |= ST_READ;
- return 1;
-}