X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fstored%2Fmount.c;h=a7485b04489eb9955900ee07ee062161d9ae8951;hb=7503a438c87931cf1748bd0fda3bb932e2af3346;hp=4efe9b3641801ad8e439757945296458c4d40856;hpb=c62398d50d0f5afb873192adfef6a330bb260e3e;p=bacula%2Fbacula diff --git a/bacula/src/stored/mount.c b/bacula/src/stored/mount.c index 4efe9b3641..a7485b0448 100644 --- a/bacula/src/stored/mount.c +++ b/bacula/src/stored/mount.c @@ -4,11 +4,11 @@ * writing. * * Kern Sibbald, August MMII - * + * * Version $Id$ */ /* - Copyright (C) 2000-2003 Kern Sibbald and John Walker + Copyright (C) 2000-2005 Kern Sibbald This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -30,12 +30,10 @@ #include "bacula.h" /* pull in global headers */ #include "stored.h" /* pull in Storage Deamon headers */ -/* Forward referenced functions */ - /* - * If release is set, we rewind the current volume, - * which we no longer want, and ask the user (console) + * If release is set, we rewind the current volume, + * which we no longer want, and ask the user (console) * to mount the next volume. * * Continue trying until we get it, and then ensure @@ -43,46 +41,73 @@ * * This routine returns a 0 only if it is REALLY * impossible to get the requested Volume. + * */ -int mount_next_write_volume(JCR *jcr, DEVICE *dev, DEV_BLOCK *block, int release) +bool mount_next_write_volume(DCR *dcr, bool release) { - int recycle, ask, retry = 0, autochanger; + int retry = 0; + bool ask = false, recycle, autochanger; + int vol_label_status; + DEVICE *dev = dcr->dev; + JCR *jcr = dcr->jcr; + DEV_BLOCK *block = dcr->block; Dmsg0(100, "Enter mount_next_volume()\n"); + init_dev_wait_timers(dev); + + /* + * Attempt to mount the next volume. If something non-fatal goes + * wrong, we come back here to re-try (new op messages, re-read + * Volume, ...) + */ mount_next_vol: - if (retry++ > 5) { - Jmsg(jcr, M_FATAL, 0, _("Too many errors trying to mount device %s.\n"), - dev_name(dev)); - return 0; + /* Ignore retry if this is poll request */ + if (!dev->poll && retry++ > 4) { + /* Last ditch effort before giving up, force operator to respond */ + dcr->VolCatInfo.Slot = 0; + if (!dir_ask_sysop_to_mount_volume(dcr)) { + Jmsg(jcr, M_FATAL, 0, _("Too many errors trying to mount device %s.\n"), + dev->print_name()); + return false; + } } if (job_canceled(jcr)) { - Jmsg(jcr, M_FATAL, 0, _("Job canceled.\n")); - return 0; + Jmsg(jcr, M_FATAL, 0, _("Job %d canceled.\n"), jcr->JobId); + return false; } - recycle = ask = autochanger = 0; + recycle = false; if (release) { Dmsg0(100, "mount_next_volume release=1\n"); - - release_volume(jcr, dev); - ask = 1; /* ask operator to mount tape */ + release_volume(dcr); + ask = true; /* ask operator to mount tape */ } - /* - * Get Director's idea of what tape we should have mounted. + /* + * Get Director's idea of what tape we should have mounted. + * in dcr->VolCatInfo */ - if (!dir_find_next_appendable_volume(jcr) && - !dir_ask_sysop_to_mount_next_volume(jcr, dev)) { - return 0; + Dmsg0(200, "Before dir_find_next_appendable_volume.\n"); + while (!dir_find_next_appendable_volume(dcr)) { + Dmsg0(200, "not dir_find_next\n"); + if (!dir_ask_sysop_to_create_appendable_volume(dcr)) { + return false; + } + Dmsg0(200, "Again dir_find_next_append...\n"); } - Dmsg2(100, "After find_next_append. Vol=%s Slot=%d\n", - jcr->VolCatInfo.VolCatName, jcr->VolCatInfo.Slot); + if (job_canceled(jcr)) { + return false; + } + Dmsg3(100, "After find_next_append. Vol=%s Slot=%d Parts=%d\n", + dcr->VolCatInfo.VolCatName, dcr->VolCatInfo.Slot, dcr->VolCatInfo.VolCatParts); + + dev->num_parts = dcr->VolCatInfo.VolCatParts; - /* + /* * Get next volume and ready it for append * This code ensures that the device is ready for * writing. We start from the assumption that there - * may not be a tape mounted. + * may not be a tape mounted. * * If the device is a file, we create the output * file. If it is a tape, we check the volume name @@ -91,206 +116,222 @@ mount_next_vol: * It assumes that the device is not already in use! * */ + if (autoload_device(dcr, 1, NULL) > 0) { + autochanger = true; + ask = false; + } else { + autochanger = false; + dcr->VolCatInfo.Slot = 0; + } + Dmsg1(100, "autoload_dev returns %d\n", autochanger); + /* + * If we autochanged to correct Volume or (we have not just + * released the Volume AND we can automount) we go ahead + * and read the label. If there is no tape in the drive, + * we will err, recurse and ask the operator the next time. + */ + if (!release && dev_is_tape(dev) && dev_cap(dev, CAP_AUTOMOUNT)) { + ask = false; /* don't ask SYSOP this time */ + } + /* Don't ask if not removable */ + if (!dev_cap(dev, CAP_REM)) { + ask = false; + } + Dmsg2(100, "Ask=%d autochanger=%d\n", ask, autochanger); + release = true; /* release next time if we "recurse" */ - Dmsg0(100, "Enter ready_dev_for_append\n"); - - dev->state &= ~(ST_APPEND|ST_READ|ST_EOT|ST_WEOT|ST_EOF); + if (ask && !dir_ask_sysop_to_mount_volume(dcr)) { + Dmsg0(100, "Error return ask_sysop ...\n"); + return false; /* error return */ + } + if (job_canceled(jcr)) { + return false; + } + Dmsg1(100, "want vol=%s\n", dcr->VolumeName); - jcr->VolFirstIndex = jcr->JobFiles; /* first update of Vol FileIndex */ - for ( ;; ) { - int vol_label_status; - autochanger = autoload_device(jcr, dev, 1, NULL); + if (dev->poll && dev_cap(dev, CAP_CLOSEONPOLL)) { + force_close_dev(dev); + } + /* Ensure the device is open */ + /* If we have a dvd that requires mount, we first want to guess + * which Volume is loaded, so we continue (if the wrong device is + * loaded, open_device just below would fail. + */ + if (!dev->is_dvd()) { + if (!open_device(dcr)) { + if (dev->poll) { + goto mount_next_vol; + } else { + return false; + } + } + } else { /* - * If we autochanged to correct Volume or (we have not just - * released the Volume AND we can automount) we go ahead - * and read the label. If there is no tape in the drive, - * we will err, recurse and ask the operator the next time. + * Just copy the VolCatName in the device resource + * (usually done by open_dev). + * It is necessary so we can open the real files later. */ - if (autochanger || (!release && dev_is_tape(dev) && dev_cap(dev, CAP_AUTOMOUNT))) { - ask = 0; /* don't ask SYSOP this time */ - } + bstrncpy(dev->VolCatInfo.VolCatName, dcr->VolCatInfo.VolCatName, sizeof(dev->VolCatInfo.VolCatName)); + } - release = 1; /* release next time if we "recurse" */ + /* + * Now make sure we have the right tape mounted + */ +read_volume: + /* + * If we are writing to a stream device, ASSUME the volume label + * is correct. + */ + if (dev_cap(dev, CAP_STREAM)) { + vol_label_status = VOL_OK; + create_volume_label(dev, dcr->VolumeName, "Default"); + dev->VolHdr.LabelType = PRE_LABEL; + } else if (dev->is_dvd()) { + vol_label_status = read_dev_volume_label_guess(dcr, 1); + } else { + vol_label_status = read_dev_volume_label(dcr); + } + if (job_canceled(jcr)) { + return false; + } -ask_again: - if (ask && !dir_ask_sysop_to_mount_next_volume(jcr, dev)) { - Dmsg0(100, "Error return ask_sysop ...\n"); - return 0; /* error return */ + Dmsg2(100, "dirVol=%s dirStat=%s\n", dcr->VolumeName, + dcr->VolCatInfo.VolCatStatus); + /* + * At this point, dev->VolCatInfo has what is in the drive, if anything, + * and dcr->VolCatInfo has what the Director wants. + */ + switch (vol_label_status) { + case VOL_OK: + Dmsg1(100, "Vol OK name=%s\n", dcr->VolumeName); + memcpy(&dev->VolCatInfo, &dcr->VolCatInfo, sizeof(dev->VolCatInfo)); + recycle = strcmp(dev->VolCatInfo.VolCatStatus, "Recycle") == 0; + break; /* got a Volume */ + case VOL_NAME_ERROR: + VOLUME_CAT_INFO VolCatInfo; + + /* If not removable, Volume is broken */ + if (!dev_cap(dev, CAP_REM)) { + Jmsg(jcr, M_WARNING, 0, _("Volume \"%s\" not on device %s.\n"), + dcr->VolumeName, dev->print_name()); + mark_volume_in_error(dcr); + goto mount_next_vol; } - Dmsg1(100, "want vol=%s\n", jcr->VolumeName); - /* Open device */ - if (!(dev->state & ST_OPENED)) { - int mode; - if (dev_cap(dev, CAP_STREAM)) { - mode = OPEN_WRITE_ONLY; - } else { - mode = OPEN_READ_WRITE; - } - if (open_dev(dev, jcr->VolCatInfo.VolCatName, mode) < 0) { - Jmsg2(jcr, M_FATAL, 0, _("Unable to open device %s. ERR=%s\n"), - dev_name(dev), strerror_dev(dev)); - return 0; - } + Dmsg1(100, "Vol NAME Error Name=%s\n", dcr->VolumeName); + /* If polling and got a previous bad name, ignore it */ + if (dev->poll && strcmp(dev->BadVolName, dev->VolHdr.VolName) == 0) { + ask = true; + Dmsg1(200, "Vol Name error supress due to poll. Name=%s\n", + dcr->VolumeName); + goto mount_next_vol; } - /* - * Now make sure we have the right tape mounted - */ -read_volume: - /* - * If we are writing to a stream device, ASSUME the volume label - * is correct. + * OK, we got a different volume mounted. First save the + * requested Volume info (jcr) structure, then query if + * this volume is really OK. If not, put back the desired + * volume name and continue. */ - if (dev_cap(dev, CAP_STREAM)) { - vol_label_status = VOL_OK; - create_volume_label(dev, jcr->VolumeName); - dev->VolHdr.LabelType = PRE_LABEL; - } else { - vol_label_status = read_dev_volume_label(jcr, dev, block); + memcpy(&VolCatInfo, &dcr->VolCatInfo, sizeof(VolCatInfo)); + /* Check if this is a valid Volume in the pool */ + bstrncpy(dcr->VolumeName, dev->VolHdr.VolName, sizeof(dcr->VolumeName)); + if (!dir_get_volume_info(dcr, GET_VOL_INFO_FOR_WRITE)) { + bstrncpy(dev->BadVolName, dev->VolHdr.VolName, sizeof(dev->BadVolName)); + Jmsg(jcr, M_WARNING, 0, _("Director wanted Volume \"%s\".\n" + " Current Volume \"%s\" not acceptable because:\n" + " %s"), + VolCatInfo.VolCatName, dev->VolHdr.VolName, + jcr->dir_bsock->msg); + /* Restore desired volume name, note device info out of sync */ + memcpy(&dcr->VolCatInfo, &VolCatInfo, sizeof(dcr->VolCatInfo)); + ask = true; + goto mount_next_vol; } + Dmsg1(100, "want new name=%s\n", dcr->VolumeName); + memcpy(&dev->VolCatInfo, &dcr->VolCatInfo, sizeof(dev->VolCatInfo)); + recycle = strcmp(dev->VolCatInfo.VolCatStatus, "Recycle") == 0; + break; /* got a Volume */ + /* + * At this point, we assume we have a blank tape mounted. + */ + case VOL_NO_LABEL: + case VOL_IO_ERROR: /* - * At this point, dev->VolCatInfo has what is in the drive, if anything, - * and jcr->VolCatInfo has what the Director wants. + * If permitted, we label the device, make sure we can do + * it by checking that the VolCatBytes is zero => not labeled, + * once the Volume is labeled we don't want to label another + * blank tape with the same name. For disk, we go ahead and + * label it anyway, because the OS insures that there is only + * one Volume with that name. + * As noted above, at this point dcr->VolCatInfo has what + * the Director wants and dev->VolCatInfo has info on the + * previous tape (or nothing). */ - switch (vol_label_status) { - case VOL_OK: - Dmsg1(100, "Vol OK name=%s\n", jcr->VolumeName); - memcpy(&dev->VolCatInfo, &jcr->VolCatInfo, sizeof(jcr->VolCatInfo)); - if (strcmp(dev->VolCatInfo.VolCatStatus, "Recycle") == 0) { - recycle = 1; + if (dev_cap(dev, CAP_LABEL) && (dcr->VolCatInfo.VolCatBytes == 0 || + (!dev->is_tape() && strcmp(dcr->VolCatInfo.VolCatStatus, + "Recycle") == 0))) { + Dmsg0(100, "Create volume label\n"); + /* Create a new Volume label and write it to the device */ + if (!write_new_volume_label_to_dev(dcr, dcr->VolumeName, + dcr->pool_name)) { + Dmsg0(100, "!write_vol_label\n"); + goto mount_next_vol; } - break; /* got a Volume */ - case VOL_NAME_ERROR: - VOLUME_CAT_INFO VolCatInfo; - - Dmsg1(100, "Vol NAME Error Name=%s\n", jcr->VolumeName); - /* - * OK, we got a different volume mounted. First save the - * requested Volume info (jcr) structure, then query if - * this volume is really OK. If not, put back the desired - * volume name and continue. - */ - memcpy(&VolCatInfo, &jcr->VolCatInfo, sizeof(jcr->VolCatInfo)); - /* Check if this is a valid Volume in the pool */ - pm_strcpy(&jcr->VolumeName, dev->VolHdr.VolName); - if (!dir_get_volume_info(jcr, GET_VOL_INFO_FOR_WRITE)) { - Mmsg(&jcr->errmsg, _("Director wanted Volume \"%s\".\n" - " Current Volume \"%s\" not acceptable because:\n" - " %s"), - VolCatInfo.VolCatName, dev->VolHdr.VolName, - jcr->dir_bsock->msg); - /* Restore desired volume name, note device info out of sync */ - memcpy(&jcr->VolCatInfo, &VolCatInfo, sizeof(jcr->VolCatInfo)); - goto mount_error; + Dmsg0(100, "dir_update_vol_info. Set Append\n"); + /* Copy Director's info into the device info */ + memcpy(&dev->VolCatInfo, &dcr->VolCatInfo, sizeof(dev->VolCatInfo)); + if (!dir_update_volume_info(dcr, true)) { /* indicate tape labeled */ + return false; } - Dmsg1(100, "want new name=%s\n", jcr->VolumeName); - memcpy(&dev->VolCatInfo, &jcr->VolCatInfo, sizeof(jcr->VolCatInfo)); - break; /* got a Volume */ - - case VOL_NO_LABEL: - case VOL_IO_ERROR: - Dmsg1(500, "Vol NO_LABEL or IO_ERROR name=%s\n", jcr->VolumeName); - /* If permitted, create a label */ - if (dev_cap(dev, CAP_LABEL)) { - Dmsg0(100, "Create volume label\n"); - if (!write_volume_label_to_dev(jcr, (DEVRES *)dev->device, jcr->VolumeName, - jcr->pool_name)) { - Dmsg0(100, "!write_vol_label\n"); - goto mount_next_vol; - } - Jmsg(jcr, M_INFO, 0, _("Labeled new Volume \"%s\" on device %s.\n"), - jcr->VolumeName, dev_name(dev)); - goto read_volume; /* read label we just wrote */ - } - /* NOTE! Fall-through wanted. */ - default: -mount_error: - /* Send error message */ - Jmsg1(jcr, M_WARNING, 0, "%s", jcr->errmsg); - Dmsg0(100, "Default\n"); - ask = 1; - goto ask_again; + Jmsg(jcr, M_INFO, 0, _("Labeled new Volume \"%s\" on device %s.\n"), + dcr->VolumeName, dev->print_name()); + goto read_volume; /* read label we just wrote */ + } + /* If not removable, Volume is broken */ + if (!dev_cap(dev, CAP_REM)) { + Jmsg(jcr, M_WARNING, 0, _("Volume \"%s\" not on device %s.\n"), + dcr->VolumeName, dev->print_name()); + mark_volume_in_error(dcr); + if (autochanger) { + mark_volume_not_inchanger(dcr); + } + goto mount_next_vol; } - break; + /* NOTE! Fall-through wanted. */ + case VOL_NO_MEDIA: + default: + /* Send error message */ + if (!dev->poll) { + Jmsg(jcr, M_WARNING, 0, "%s", jcr->errmsg); + } else { + Dmsg1(200, "Msg suppressed by poll: %s\n", jcr->errmsg); + } + ask = true; + /* Needed, so the medium can be changed */ + if (dev_cap(dev, CAP_REQMOUNT)) { + close_dev(dev); + } + goto mount_next_vol; } - /* - * See if we have a fresh tape or tape with data. + /* + * See if we have a fresh tape or a tape with data. * * Note, if the LabelType is PRE_LABEL, it was labeled * but never written. If so, rewrite the label but set as * VOL_LABEL. We rewind and return the label (reconstructed) * in the block so that in the case of a new tape, data can * be appended just after the block label. If we are writing - * an second volume, the calling routine will write the label + * a second volume, the calling routine will write the label * before writing the overflow block. * * If the tape is marked as Recycle, we rewrite the label. */ if (dev->VolHdr.LabelType == PRE_LABEL || recycle) { - Dmsg1(190, "ready_for_append found freshly labeled volume. dev=%x\n", dev); - dev->VolHdr.LabelType = VOL_LABEL; /* set Volume label */ - write_volume_label_to_block(jcr, dev, block); - /* - * If we are not dealing with a streaming device, - * write the block now to ensure we have write permission. - * It is better to find out now rather than later. - */ - if (!dev_cap(dev, CAP_STREAM)) { - dev->VolCatInfo.VolCatBytes = 0; - if (!rewind_dev(dev)) { - Jmsg2(jcr, M_WARNING, 0, _("Rewind error on device %s. ERR=%s\n"), - dev_name(dev), strerror_dev(dev)); - } - if (recycle) { - if (!truncate_dev(dev)) { - Jmsg2(jcr, M_WARNING, 0, _("Truncate error on device %s. ERR=%s\n"), - dev_name(dev), strerror_dev(dev)); - } - } - /* Attempt write to check write permission */ - if (!write_block_to_dev(jcr, dev, block)) { - Jmsg2(jcr, M_ERROR, 0, _("Unable to write device %s. ERR=%s\n"), - dev_name(dev), strerror_dev(dev)); - goto mount_next_vol; - } - if (!rewind_dev(dev)) { - Jmsg2(jcr, M_ERROR, 0, _("Unable to rewind device %s. ERR=%s\n"), - dev_name(dev), strerror_dev(dev)); - goto mount_next_vol; - } - - /* Recreate a correct volume label and return it in the block */ - write_volume_label_to_block(jcr, dev, block); - } - /* Set or reset Volume statistics */ - dev->VolCatInfo.VolCatJobs = 0; - dev->VolCatInfo.VolCatFiles = 0; - dev->VolCatInfo.VolCatErrors = 0; - dev->VolCatInfo.VolCatBlocks = 0; - dev->VolCatInfo.VolCatRBytes = 0; - if (recycle) { - dev->VolCatInfo.VolCatMounts++; - dev->VolCatInfo.VolCatRecycles++; - } else { - dev->VolCatInfo.VolCatMounts = 1; - dev->VolCatInfo.VolCatRecycles = 0; - dev->VolCatInfo.VolCatWrites = 1; - dev->VolCatInfo.VolCatReads = 1; - } - strcpy(dev->VolCatInfo.VolCatStatus, "Append"); - Dmsg0(200, "dir_update_vol_info. Set Append\n"); - dir_update_volume_info(jcr, &dev->VolCatInfo, 1); /* indicate doing relabel */ - if (recycle) { - Jmsg(jcr, M_INFO, 0, _("Recycled volume \"%s\" on device %s, all previous data lost.\n"), - jcr->VolumeName, dev_name(dev)); - } else { - Jmsg(jcr, M_INFO, 0, _("Wrote label to prelabeled Volume \"%s\" on device %s\n"), - jcr->VolumeName, dev_name(dev)); + if (!rewrite_volume_label(dcr, recycle)) { + goto mount_next_vol; } - } else { /* * OK, at this point, we have a valid Bacula label, but @@ -299,15 +340,11 @@ mount_error: */ Dmsg0(200, "Device previously written, moving to end of data\n"); Jmsg(jcr, M_INFO, 0, _("Volume \"%s\" previously written, moving to end of data.\n"), - jcr->VolumeName); + dcr->VolumeName); if (!eod_dev(dev)) { - Jmsg(jcr, M_ERROR, 0, _("Unable to position to end of data %s. ERR=%s\n"), - dev_name(dev), strerror_dev(dev)); - Jmsg(jcr, M_INFO, 0, _("Marking Volume \"%s\" in Error in Catalog.\n"), - jcr->VolumeName); - strcpy(dev->VolCatInfo.VolCatStatus, "Error"); - Dmsg0(200, "dir_update_vol_info. Set Error.\n"); - dir_update_volume_info(jcr, &dev->VolCatInfo, 0); + Jmsg(jcr, M_ERROR, 0, _("Unable to position to end of data on device %s: ERR=%s\n"), + dev->print_name(), strerror_dev(dev)); + mark_volume_in_error(dcr); goto mount_next_vol; } /* *****FIXME**** we should do some checking for files too */ @@ -317,75 +354,103 @@ mount_error: * that the database says we should be. */ if (dev->VolCatInfo.VolCatFiles == dev_file(dev)) { - Jmsg(jcr, M_INFO, 0, _("Ready to append to end of Volume at file=%d.\n"), - dev_file(dev)); + Jmsg(jcr, M_INFO, 0, _("Ready to append to end of Volume \"%s\" at file=%d.\n"), + dcr->VolumeName, dev_file(dev)); } else { - Jmsg(jcr, M_ERROR, 0, _("I canot write on this volume because:\n\ -The number of files mismatch! Volume=%u Catalog=%u\n"), - dev_file(dev), dev->VolCatInfo.VolCatFiles); - strcpy(dev->VolCatInfo.VolCatStatus, "Error"); - Dmsg0(200, "dir_update_vol_info. Set Error.\n"); - dir_update_volume_info(jcr, &dev->VolCatInfo, 0); + Jmsg(jcr, M_ERROR, 0, _("I canot write on Volume \"%s\" because:\n" +"The number of files mismatch! Volume=%u Catalog=%u\n"), + dcr->VolumeName, dev_file(dev), dev->VolCatInfo.VolCatFiles); + mark_volume_in_error(dcr); goto mount_next_vol; } } dev->VolCatInfo.VolCatMounts++; /* Update mounts */ - Dmsg1(200, "update volinfo mounts=%d\n", dev->VolCatInfo.VolCatMounts); - dir_update_volume_info(jcr, &dev->VolCatInfo, 0); + Dmsg1(100, "update volinfo mounts=%d\n", dev->VolCatInfo.VolCatMounts); + if (!dir_update_volume_info(dcr, false)) { + return false; + } /* Return an empty block */ empty_block(block); /* we used it for reading so set for write */ } dev->state |= ST_APPEND; - Dmsg0(100, "Normal return from read_dev_for_append\n"); - return 1; + Dmsg0(100, "set APPEND, normal return from read_dev_for_append\n"); + return true; } -int mount_next_read_volume(JCR *jcr, DEVICE *dev, DEV_BLOCK *block) + +/* + * Mark volume in error in catalog + */ +void mark_volume_in_error(DCR *dcr) { + DEVICE *dev = dcr->dev; + Jmsg(dcr->jcr, M_INFO, 0, _("Marking Volume \"%s\" in Error in Catalog.\n"), + dcr->VolumeName); + bstrncpy(dev->VolCatInfo.VolCatStatus, "Error", sizeof(dev->VolCatInfo.VolCatStatus)); + Dmsg0(100, "dir_update_vol_info. Set Error.\n"); + dir_update_volume_info(dcr, false); +} + +/* + * If we are reading, we come here at the end of the tape + * and see if there are more volumes to be mounted. + */ +bool mount_next_read_volume(DCR *dcr) +{ + DEVICE *dev = dcr->dev; + JCR *jcr = dcr->jcr; Dmsg2(90, "NumVolumes=%d CurVolume=%d\n", jcr->NumVolumes, jcr->CurVolume); /* * End Of Tape -- mount next Volume (if another specified) */ if (jcr->NumVolumes > 1 && jcr->CurVolume < jcr->NumVolumes) { close_dev(dev); - dev->state &= ~ST_READ; - if (!acquire_device_for_read(jcr, dev, block)) { - Jmsg2(jcr, M_FATAL, 0, "Cannot open Dev=%s, Vol=%s\n", dev_name(dev), - jcr->VolumeName); - return 0; + dev->state &= ~ST_READ; + if (!acquire_device_for_read(jcr, dev)) { + Jmsg2(jcr, M_FATAL, 0, "Cannot open Dev=%s, Vol=%s\n", dev->print_name(), + dcr->VolumeName); + return false; } - return 1; /* next volume mounted */ + return true; /* next volume mounted */ } Dmsg0(90, "End of Device reached.\n"); - return 0; + return false; } -void release_volume(JCR *jcr, DEVICE *dev) +/* + * Either because we are going to hang a new volume, or because + * of explicit user request, we release the current volume. + */ +void release_volume(DCR *dcr) { - /********FIXME******* if WroteVol, must write JobMedia record */ - /* - * First erase all memory of the current volume - */ - - if (jcr->WroteVol) { - Jmsg0(jcr, M_ERROR, 0, "Hey!!!!! WriteVol non-zero !!!!!\n"); + JCR *jcr = dcr->jcr; + DEVICE *dev = dcr->dev; + if (dcr->WroteVol) { + Jmsg0(jcr, M_ERROR, 0, "Hey!!!!! WroteVol non-zero !!!!!\n"); + Dmsg0(190, "Hey!!!!! WroteVol non-zero !!!!!\n"); } + /* + * First erase all memory of the current volume + */ dev->block_num = dev->file = 0; dev->EndBlock = dev->EndFile = 0; memset(&dev->VolCatInfo, 0, sizeof(dev->VolCatInfo)); - memset(&jcr->VolCatInfo, 0, sizeof(jcr->VolCatInfo)); + memset(&dcr->VolCatInfo, 0, sizeof(dcr->VolCatInfo)); memset(&dev->VolHdr, 0, sizeof(dev->VolHdr)); - dev->state &= ~ST_LABEL; /* label not yet read */ - jcr->VolumeName[0] = 0; + /* Force re-read of label */ + dev->state &= ~(ST_LABEL|ST_READ|ST_APPEND); + dev->label_type = B_BACULA_LABEL; + dcr->VolumeName[0] = 0; - if (!dev_is_tape(dev) || !dev_cap(dev, CAP_ALWAYSOPEN)) { + if (dev->is_open() && (!dev->is_tape() || !dev_cap(dev, CAP_ALWAYSOPEN))) { offline_or_rewind_dev(dev); close_dev(dev); } /* If we have not closed the device, then at least rewind the tape */ - if (dev->state & ST_OPENED) { + if (dev->is_open()) { offline_or_rewind_dev(dev); } + Dmsg0(190, "===== release_volume ---"); }