X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fstored%2Facquire.c;h=e0ce9c5be3ff54ebcd71d16e3877ac96453a54f1;hb=eeeb98532770101aa2b310ac43c9379316c447ce;hp=8595dd5d4261aacba5dc9ca7c77e78bfb9db6d70;hpb=01a063916d63cbc122bdafa4624eabfad677a4bc;p=bacula%2Fbacula diff --git a/bacula/src/stored/acquire.c b/bacula/src/stored/acquire.c index 8595dd5d42..e0ce9c5be3 100644 --- a/bacula/src/stored/acquire.c +++ b/bacula/src/stored/acquire.c @@ -9,19 +9,14 @@ Copyright (C) 2002-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 - published by the Free Software Foundation; either version 2 of - the License, or (at your option) any later version. + modify it under the terms of the GNU General Public License + version 2 as amended with additional clauses defined in the + file LICENSE in the main source directory. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + the file LICENSE for additional details. */ @@ -34,28 +29,22 @@ */ DCR *new_dcr(JCR *jcr, DEVICE *dev) { - if (jcr && jcr->dcr) { - return jcr->dcr; - } DCR *dcr = (DCR *)malloc(sizeof(DCR)); memset(dcr, 0, sizeof(DCR)); - if (jcr) { - jcr->dcr = dcr; - } dcr->jcr = jcr; - dcr->dev = dev; if (dev) { + dcr->dev = dev; dcr->device = dev->device; + dcr->block = new_block(dev); + dcr->rec = new_record(); + dcr->max_job_spool_size = dev->device->max_job_spool_size; + /* Attach this dcr only if dev is initialized */ + if (dev->fd != 0 && jcr && jcr->JobType != JT_SYSTEM) { + dev->attached_dcrs->append(dcr); /* attach dcr to device */ +// jcr->dcrs->append(dcr); /* put dcr in list for Job */ + } } - dcr->block = new_block(dev); - dcr->rec = new_record(); dcr->spool_fd = -1; - dcr->max_spool_size = dev->device->max_spool_size; - /* Attach this dcr only if dev is initialized */ - if (dev->fd != 0 && jcr && jcr->JobType != JT_SYSTEM) { - dev->attached_dcrs->append(dcr); -// jcr->dcrs->append(dcr); - } return dcr; } @@ -73,13 +62,13 @@ static void remove_dcr_from_dcrs(DCR *dcr) DCR *ldcr; int num = jcr->dcrs->size(); for (i=0; i < num; i++) { - ldcr = (DCR *)jcr->dcrs->get(i); - if (ldcr == dcr) { - jcr->dcrs->remove(i); - if (jcr->dcr == dcr) { - jcr->dcr = NULL; - } - } + ldcr = (DCR *)jcr->dcrs->get(i); + if (ldcr == dcr) { + jcr->dcrs->remove(i); + if (jcr->dcr == dcr) { + jcr->dcr = NULL; + } + } } } } @@ -94,25 +83,22 @@ void free_dcr(DCR *dcr) JCR *jcr = dcr->jcr; DEVICE *dev = dcr->dev; - /* - * If we reserved the device, we must decrement the - * number of writers. - */ if (dcr->reserved_device) { lock_device(dev); - dev->num_writers--; + dev->reserved_device--; + Dmsg1(200, "Dec reserve=%d\n", dev->reserved_device); + dcr->reserved_device = false; if (dev->num_writers < 0) { Jmsg1(dcr->jcr, M_ERROR, 0, _("Hey! num_writers=%d!!!!\n"), dev->num_writers); - dev->num_writers = 0; - dcr->reserved_device = false; + dev->num_writers = 0; } unlock_device(dev); } /* Detach this dcr only if the dev is initialized */ if (dev->fd != 0 && jcr && jcr->JobType != JT_SYSTEM) { - dev->attached_dcrs->remove(dcr); -// remove_dcr_from_dcrs(dcr); + dev->attached_dcrs->remove(dcr); /* detach dcr from device */ +// remove_dcr_from_dcrs(dcr); /* remove dcr from jcr list */ } if (dcr->block) { free_block(dcr->block); @@ -123,52 +109,10 @@ void free_dcr(DCR *dcr) if (dcr->jcr) { dcr->jcr->dcr = NULL; } + free_unused_volume(dcr); /* free unused vols attached to this dcr */ free(dcr); } - -/* - * We "reserve" the drive by setting the ST_READ bit. No one else - * should touch the drive until that is cleared. - * This allows the DIR to "reserve" the device before actually - * starting the job. If the device is not available, the DIR - * can wait (to be implemented 1/05). - */ -bool reserve_device_for_read(JCR *jcr, DEVICE *dev) -{ - DCR *dcr = jcr->dcr; - bool ok = false; - - ASSERT(dcr); - if (device_is_unmounted(dev)) { - Jmsg(jcr, M_WARNING, 0, _("device %s is BLOCKED due to user unmount.\n"), - dev->print_name()); - return false; - } - lock_device(dev); - block_device(dev, BST_DOING_ACQUIRE); - unlock_device(dev); - - if (dev->is_busy()) { - Jmsg2(jcr, M_FATAL, 0, _("Device %s is busy. Job %d canceled.\n"), - dev->print_name(), jcr->JobId); - goto get_out; - } - if (!dcr) { - dcr = new_dcr(jcr, dev); - } - dev->clear_append(); - dev->set_read(); - ok = true; - -get_out: - P(dev->mutex); - unblock_device(dev); - V(dev->mutex); - return ok; -} - - /********************************************************************* * Acquire device for reading. * The drive should have previously been reserved by calling @@ -176,33 +120,25 @@ get_out: * leave the block pointers just after the label. * * Returns: NULL if failed for any reason - * dcr if successful + * dcr if successful */ -DCR *acquire_device_for_read(JCR *jcr, DEVICE *dev) +DCR *acquire_device_for_read(DCR *dcr) { + DEVICE *dev = dcr->dev; + JCR *jcr = dcr->jcr; bool vol_ok = false; bool tape_previously_mounted; bool tape_initially_mounted; VOL_LIST *vol; bool try_autochanger = true; int i; - DCR *dcr = jcr->dcr; int vol_label_status; - lock_device(dev); - block_device(dev, BST_DOING_ACQUIRE); - unlock_device(dev); - - init_dev_wait_timers(dev); - - tape_previously_mounted = dev->can_read() || - dev->can_append() || - dev->is_labeled(); - tape_initially_mounted = tape_previously_mounted; + dev->block(BST_DOING_ACQUIRE); if (dev->num_writers > 0) { Jmsg2(jcr, M_FATAL, 0, _("Num_writers=%d not zero. Job %d canceled.\n"), - dev->num_writers, jcr->JobId); + dev->num_writers, jcr->JobId); goto get_out; } @@ -216,112 +152,110 @@ DCR *acquire_device_for_read(JCR *jcr, DEVICE *dev) for (i=1; iCurVolume; i++) { vol = vol->next; } + if (!vol) { + goto get_out; /* should not happen */ + } bstrncpy(dcr->VolumeName, vol->VolumeName, sizeof(dcr->VolumeName)); + init_device_wait_timers(dcr); + + tape_previously_mounted = dev->can_read() || dev->can_append() || + dev->is_labeled(); + tape_initially_mounted = tape_previously_mounted; + + /* Volume info is always needed because of VolParts */ Dmsg0(200, "dir_get_volume_info\n"); if (!dir_get_volume_info(dcr, GET_VOL_INFO_FOR_READ)) { Jmsg1(jcr, M_WARNING, 0, "%s", jcr->errmsg); } - dev->num_parts = dcr->VolCatInfo.VolCatParts; - for (i=0; i<5; i++) { - dev->clear_labeled(); /* force reread of label */ + dev->clear_labeled(); /* force reread of label */ if (job_canceled(jcr)) { Mmsg1(dev->errmsg, _("Job %d canceled.\n"), jcr->JobId); - goto get_out; /* error return */ + 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->is_open(); ) { - Dmsg1(120, "bstored: open vol=%s\n", dcr->VolumeName); - if (open_dev(dev, dcr->VolumeName, OPEN_READ_ONLY) < 0) { - if (dev->dev_errno == EIO) { /* no tape loaded */ - goto default_path; - } - - /* If we have a dvd that requires mount, - * we need to try to open the label, so the info can be reported - * if a wrong volume has been mounted. */ - if (dev->is_dvd() && (dcr->VolCatInfo.VolCatParts > 0)) { - break; - } - - Jmsg(jcr, M_FATAL, 0, _("Open device %s Volume \"%s\" failed: ERR=%s\n"), - dev->print_name(), dcr->VolumeName, strerror_dev(dev)); - goto get_out; - } - Dmsg1(129, "open_dev %s OK\n", dev->print_name()); + Dmsg1(100, "bstored: open vol=%s\n", dcr->VolumeName); + if (dev->open(dcr, OPEN_READ_ONLY) < 0) { + if (dev->dev_errno == EIO) { /* no tape loaded */ + Jmsg3(jcr, M_WARNING, 0, _("Open device %s Volume \"%s\" failed (EIO): ERR=%s\n"), + dev->print_name(), dcr->VolumeName, strerror_dev(dev)); + goto default_path; + } + + Jmsg3(jcr, M_FATAL, 0, _("Open device %s Volume \"%s\" failed: ERR=%s\n"), + dev->print_name(), dcr->VolumeName, strerror_dev(dev)); + goto get_out; } + Dmsg1(100, "opened dev %s OK\n", dev->print_name()); - if (dev->is_dvd()) { - vol_label_status = read_dev_volume_label_guess(dcr, 0); - } else { - vol_label_status = read_dev_volume_label(dcr); - } + /* Read Volume Label */ Dmsg0(200, "calling read-vol-label\n"); + vol_label_status = read_dev_volume_label(dcr); switch (vol_label_status) { case VOL_OK: - vol_ok = true; - memcpy(&dev->VolCatInfo, &dcr->VolCatInfo, sizeof(dev->VolCatInfo)); - break; /* got it */ + vol_ok = true; + memcpy(&dev->VolCatInfo, &dcr->VolCatInfo, sizeof(dev->VolCatInfo)); + 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) { + /* + * 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) { Jmsg(jcr, M_WARNING, 0, "%s", jcr->errmsg); - } - goto default_path; + } + goto default_path; case VOL_NAME_ERROR: - if (tape_initially_mounted) { - tape_initially_mounted = false; - goto default_path; - } - /* Fall through */ + if (tape_initially_mounted) { + tape_initially_mounted = false; + goto default_path; + } + /* Fall through */ default: - Jmsg(jcr, M_WARNING, 0, "%s", jcr->errmsg); + Jmsg1(jcr, M_WARNING, 0, "%s", jcr->errmsg); default_path: - tape_previously_mounted = true; - - /* If the device requires mount, close it, so the device can be ejected. - * FIXME: This should perhaps be done for all devices. */ - if (dev_cap(dev, CAP_REQMOUNT)) { - force_close_dev(dev); - } - - /* Call autochanger only once unless ask_sysop called */ - if (try_autochanger) { - int stat; + tape_previously_mounted = true; + + /* If the device requires mount, close it, so the device can be ejected. + * FIXME: This should perhaps be done for all devices. */ + if (dev->requires_mount()) { + force_close_device(dev); + } + + /* Call autochanger only once unless ask_sysop called */ + if (try_autochanger) { + int stat; Dmsg2(200, "calling autoload Vol=%s Slot=%d\n", - dcr->VolumeName, dcr->VolCatInfo.Slot); - stat = autoload_device(dcr, 0, NULL); - if (stat > 0) { - try_autochanger = false; - continue; /* try reading volume mounted */ - } - } - - /* Mount a specific volume and no other */ + dcr->VolumeName, dcr->VolCatInfo.Slot); + stat = autoload_device(dcr, 0, NULL); + if (stat > 0) { + try_autochanger = false; + continue; /* try reading volume mounted */ + } + } + + /* Mount a specific volume and no other */ Dmsg0(200, "calling dir_ask_sysop\n"); - if (!dir_ask_sysop_to_mount_volume(dcr)) { - goto get_out; /* error return */ - } - try_autochanger = true; /* permit using autochanger again */ - continue; /* try reading again */ + if (!dir_ask_sysop_to_mount_volume(dcr)) { + goto get_out; /* error return */ + } + try_autochanger = true; /* permit using autochanger again */ + continue; /* try reading again */ } /* end switch */ break; } /* end for loop */ if (!vol_ok) { Jmsg1(jcr, M_FATAL, 0, _("Too many errors trying to mount device %s.\n"), - dev->print_name()); + dev->print_name()); goto get_out; } @@ -333,132 +267,40 @@ default_path: dcr->VolumeName, dev->print_name()); get_out: - P(dev->mutex); - unblock_device(dev); - V(dev->mutex); + dev->unblock(); if (!vol_ok) { - free_dcr(dcr); dcr = NULL; } return dcr; } -/* - * We reserve the device for appending by incrementing the - * reserved_device. We do virtually all the same work that - * is done in acquire_device_for_append(), but we do - * not attempt to mount the device. This routine allows - * the DIR to reserve multiple devices before *really* - * starting the job. It also permits the SD to refuse - * certain devices (not up, ...). - * - * Note, in reserving a device, if the device is for the - * same pool and the same pool type, then it is acceptable. - * The Media Type has already been checked. If we are - * the first tor reserve the device, we put the pool - * name and pool type in the device record. - */ -bool reserve_device_for_append(JCR *jcr, DEVICE *dev) -{ - DCR *dcr = jcr->dcr; - bool ok = false; - - ASSERT(dcr); - - lock_device(dev); - block_device(dev, BST_DOING_ACQUIRE); - unlock_device(dev); - if (dev->can_read()) { - Jmsg(jcr, M_WARNING, 0, _("Device %s is busy reading.\n"), dev->print_name()); - goto bail_out; - } - if (device_is_unmounted(dev)) { - Jmsg(jcr, M_WARNING, 0, _("device %s is BLOCKED due to user unmount.\n"), - dev->print_name()); - goto bail_out; - } - Dmsg1(190, "reserve_append device is %s\n", dev_is_tape(dev)?"tape":"disk"); - /* - * First handle the case that the drive is not yet in append mode - */ - if (!dev->can_append() && dev->num_writers == 0) { - /* Now check if there are any reservations on the drive */ - if (dev->reserved_device) { - /* Yes, now check if we want the same Pool and pool type */ - if (strcmp(dev->pool_name, dcr->pool_name) == 0 && - strcmp(dev->pool_type, dcr->pool_type) == 0) { - /* OK, compatible device */ - } else { - /* Drive not suitable for us */ - Jmsg(jcr, M_WARNING, 0, _("Device %s is busy writing on another Volume.\n"), dev->print_name()); - goto bail_out; - } - } else { - /* Device is available but not yet reserved, reserve it for us */ - bstrncpy(dev->pool_name, dcr->pool_name, sizeof(dev->pool_name)); - bstrncpy(dev->pool_type, dcr->pool_type, sizeof(dev->pool_type)); - dev->PoolId = dcr->PoolId; - } - goto do_reserve; - } - - /* - * Now check if the device is in append mode - */ - if (dev->can_append() || dev->num_writers > 0) { - Dmsg0(190, "device already in append.\n"); - /* Yes, now check if we want the same Pool and pool type */ - if (strcmp(dev->pool_name, dcr->pool_name) == 0 && - strcmp(dev->pool_type, dcr->pool_type) == 0) { - /* OK, compatible device */ - } else { - /* Drive not suitable for us */ - Jmsg(jcr, M_WARNING, 0, _("Device %s is busy writing on another Volume.\n"), dev->print_name()); - goto bail_out; - } - } else { - Pmsg0(000, "Logic error!!!! Should not get here.\n"); - goto bail_out; /* should not get here */ - } - -do_reserve: - dev->reserved_device++; - dcr->reserved_device = true; - ok = true; - -bail_out: - P(dev->mutex); - unblock_device(dev); - V(dev->mutex); - return ok; -} /* * Acquire device for writing. We permit multiple writers. * If this is the first one, we read the label. * * Returns: NULL if failed for any reason - * dcr if successful. + * dcr if successful. * Note, normally reserve_device_for_append() is called * before this routine. */ -DCR *acquire_device_for_append(JCR *jcr, DEVICE *dev) +DCR *acquire_device_for_append(DCR *dcr) { bool release = false; bool recycle = false; bool do_mount = false; - DCR *dcr = jcr->dcr; + DEVICE *dev = dcr->dev; + JCR *jcr = dcr->jcr; - if (!dcr) { - dcr = new_dcr(jcr, dev); - } - 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"); + init_device_wait_timers(dcr); + + dev->block(BST_DOING_ACQUIRE); + Dmsg1(190, "acquire_append device is %s\n", dev->is_tape()?"tape": + (dev->is_dvd()?"DVD":"disk")); if (dcr->reserved_device) { dev->reserved_device--; + Dmsg1(200, "Dec reserve=%d\n", dev->reserved_device); dcr->reserved_device = false; } @@ -466,7 +308,8 @@ DCR *acquire_device_for_append(JCR *jcr, DEVICE *dev) * With the reservation system, this should not happen */ if (dev->can_read()) { - Jmsg(jcr, M_FATAL, 0, _("Device %s is busy reading.\n"), dev->print_name()); + Jmsg1(jcr, M_FATAL, 0, _("Device %s is busy reading.\n"), dev->print_name()); + Dmsg1(200, "Device %s is busy reading.\n", dev->print_name()); goto get_out; } @@ -480,37 +323,49 @@ DCR *acquire_device_for_append(JCR *jcr, DEVICE *dev) * OK if next volume matches current volume * otherwise mount desired volume obtained from * dir_find_next_appendable_volume + * dev->VolHdr.VolumeName is what is in the drive + * dcr->VolumeName is what we pass into the routines, or + * get back from the subroutines. */ - bstrncpy(dcr->VolumeName, dev->VolHdr.VolName, sizeof(dcr->VolumeName)); + bstrncpy(dcr->VolumeName, dev->VolHdr.VolumeName, sizeof(dcr->VolumeName)); if (!dir_get_volume_info(dcr, GET_VOL_INFO_FOR_WRITE) && - !(dir_find_next_appendable_volume(dcr) && - strcmp(dev->VolHdr.VolName, dcr->VolumeName) == 0)) { /* wrong tape mounted */ - Dmsg0(190, "Wrong tape mounted.\n"); - if (dev->num_writers != 0 || dev->reserved_device) { - Jmsg(jcr, M_FATAL, 0, _("Device %s is busy writing on another Volume.\n"), dev->print_name()); - goto get_out; - } - /* Wrong tape mounted, release it, then fall through to get correct one */ + !(dir_find_next_appendable_volume(dcr) && + strcmp(dev->VolHdr.VolumeName, dcr->VolumeName) == 0)) { /* wrong tape mounted */ + Dmsg2(190, "Wrong tape mounted: %s. wants:%s\n", dev->VolHdr.VolumeName, + dcr->VolumeName); + /* Release volume reserved by dir_find_next_appendable_volume() */ + if (dcr->VolumeName[0]) { + free_unused_volume(dcr); + } + if (dev->num_writers != 0) { + Jmsg3(jcr, M_FATAL, 0, _("Wanted Volume \"%s\", but device %s is busy writing on \"%s\" .\n"), + dcr->VolumeName, dev->print_name(), dev->VolHdr.VolumeName); + Dmsg3(200, "Wanted Volume \"%s\", but device %s is busy writing on \"%s\" .\n", + dcr->VolumeName, dev->print_name(), dev->VolHdr.VolumeName); + goto get_out; + } + /* Wrong tape mounted, release it, then fall through to get correct one */ Dmsg0(190, "Wrong tape mounted, release and try mount.\n"); - release = true; - do_mount = true; + release = true; + do_mount = true; } else { - /* - * At this point, the correct tape is already mounted, so - * we do not need to do mount_next_write_volume(), unless - * we need to recycle the tape. - */ + /* + * At this point, the correct tape is already mounted, so + * we do not need to do mount_next_write_volume(), unless + * we need to recycle the tape. + */ recycle = strcmp(dcr->VolCatInfo.VolCatStatus, "Recycle") == 0; Dmsg1(190, "Correct tape mounted. recycle=%d\n", recycle); - if (recycle && dev->num_writers != 0) { + if (recycle && dev->num_writers != 0) { Jmsg(jcr, M_FATAL, 0, _("Cannot recycle volume \"%s\"" - " because it is in use by another job.\n")); - goto get_out; - } - if (dev->num_writers == 0) { - memcpy(&dev->VolCatInfo, &dcr->VolCatInfo, sizeof(dev->VolCatInfo)); - } - } + " on device %s because it is in use by another job.\n"), + dev->VolHdr.VolumeName, dev->print_name()); + goto get_out; + } + if (dev->num_writers == 0) { + memcpy(&dev->VolCatInfo, &dcr->VolCatInfo, sizeof(dev->VolCatInfo)); + } + } } else { /* Not already in append mode, so mount the device */ Dmsg0(190, "Not in append mode, try mount.\n"); @@ -522,16 +377,18 @@ DCR *acquire_device_for_append(JCR *jcr, DEVICE *dev) Dmsg0(190, "Do mount_next_write_vol\n"); bool mounted = mount_next_write_volume(dcr, release); if (!mounted) { - if (!job_canceled(jcr)) { + if (!job_canceled(jcr)) { /* Reduce "noise" -- don't print if job canceled */ Jmsg(jcr, M_FATAL, 0, _("Could not ready device %s for append.\n"), - dev->print_name()); - } - goto get_out; + dev->print_name()); + Dmsg1(200, "Could not ready device %s for append.\n", + dev->print_name()); + } + goto get_out; } } - dev->num_writers++; /* we are now a writer */ + dev->num_writers++; /* we are now a writer */ if (jcr->NumVolumes == 0) { jcr->NumVolumes = 1; } @@ -545,9 +402,7 @@ get_out: free_dcr(dcr); dcr = NULL; ok_out: - P(dev->mutex); - unblock_device(dev); - V(dev->mutex); + dev->unblock(); return dcr; } @@ -558,61 +413,68 @@ ok_out: */ bool release_device(DCR *dcr) { - bool ok = true; JCR *jcr = dcr->jcr; DEVICE *dev = dcr->dev; + bool ok = true; + bool was_reading = false; lock_device(dev); - Dmsg1(100, "release_device device is %s\n", dev_is_tape(dev)?"tape":"disk"); + Dmsg1(100, "release_device device is %s\n", dev->is_tape()?"tape":"disk"); /* if device is reserved, job never started, so release the reserve here */ if (dcr->reserved_device) { dev->reserved_device--; + Dmsg1(200, "Dec reserve=%d\n", dev->reserved_device); dcr->reserved_device = false; } if (dev->can_read()) { - dev->clear_read(); /* clear read bit */ - /* Close if file or !CAP_ALWAYSOPEN */ - if (!dev->is_tape() || !dev_cap(dev, CAP_ALWAYSOPEN)) { - offline_or_rewind_dev(dev); - close_dev(dev); - } + dev->clear_read(); /* clear read bit */ + was_reading = true; + /******FIXME**** send read volume usage statistics to director */ } else if (dev->num_writers > 0) { + /* + * Note if WEOT is set, we are at the end of the tape + * and may not be positioned correctly, so the + * job_media_record and update_vol_info have already been + * done, which means we skip them here. + */ dev->num_writers--; Dmsg1(100, "There are %d writers in release_device\n", dev->num_writers); if (dev->is_labeled()) { Dmsg0(100, "dir_create_jobmedia_record. Release\n"); - if (!dir_create_jobmedia_record(dcr)) { + if (!dev->at_weot() && !dir_create_jobmedia_record(dcr)) { Jmsg(jcr, M_FATAL, 0, _("Could not create JobMedia record for Volume=\"%s\" Job=%s\n"), - dcr->VolCatInfo.VolCatName, jcr->Job); - ok = false; - } - /* If no more writers, write an EOF */ - if (!dev->num_writers && dev_can_write(dev)) { - weof_dev(dev, 1); - write_ansi_ibm_labels(dcr, ANSI_EOF_LABEL, dev->VolHdr.VolName); - } - dev->VolCatInfo.VolCatFiles = dev->file; /* set 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. Release0\n"); - dir_update_volume_info(dcr, false); /* send Volume info to Director */ - Dmsg0(100, "==== write ansi eof label \n"); + dcr->VolCatInfo.VolCatName, jcr->Job); + } + /* If no more writers, write an EOF */ + if (!dev->num_writers && dev->can_write()) { + weof_dev(dev, 1); + write_ansi_ibm_labels(dcr, ANSI_EOF_LABEL, dev->VolHdr.VolumeName); + } + if (!dev->at_weot()) { + dev->VolCatInfo.VolCatFiles = dev->file; /* set 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. Release0\n"); + dir_update_volume_info(dcr, false); /* send Volume info to Director */ + } } - /* If no writers, close if file or !CAP_ALWAYS_OPEN */ - if (dev->num_writers == 0 && (!dev->is_tape() || !dev_cap(dev, CAP_ALWAYSOPEN))) { - offline_or_rewind_dev(dev); - close_dev(dev); - } } else { - Jmsg2(jcr, M_FATAL, 0, _("BAD ERROR: release_device %s, Volume \"%s\" not in use.\n"), - dev->print_name(), NPRT(dcr->VolumeName)); - Jmsg2(jcr, M_ERROR, 0, _("num_writers=%d state=%x\n"), dev->num_writers, dev->state); - ok = false; + /* + * If we reach here, it is most likely because the job + * has failed, since the device is not in read mode and + * there are no writers. It was probably reserved. + */ + } + + /* If no writers, close if file or !CAP_ALWAYS_OPEN */ + if (dev->num_writers == 0 && (!dev->is_tape() || !dev_cap(dev, CAP_ALWAYSOPEN))) { + offline_or_rewind_dev(dev); + close_device(dev); } /* Fire off Alert command and include any output */ @@ -622,20 +484,20 @@ bool release_device(DCR *dcr) BPIPE *bpipe; char line[MAXSTRING]; alert = get_pool_memory(PM_FNAME); - alert = edit_device_codes(dcr, alert, ""); + alert = edit_device_codes(dcr, alert, dcr->device->alert_command, ""); bpipe = open_bpipe(alert, 0, "r"); if (bpipe) { - while (fgets(line, sizeof(line), bpipe->rfd)) { + while (fgets(line, sizeof(line), bpipe->rfd)) { Jmsg(jcr, M_ALERT, 0, _("Alert: %s"), line); - } - status = close_bpipe(bpipe); + } + status = close_bpipe(bpipe); } else { - status = errno; + status = errno; } if (status != 0) { - berrno be; + berrno be; Jmsg(jcr, M_ALERT, 0, _("3997 Bad alert command: %s: ERR=%s.\n"), - alert, be.strerror(status)); + alert, be.strerror(status)); } Dmsg1(400, "alert status=%d\n", status); @@ -643,6 +505,11 @@ bool release_device(DCR *dcr) } unlock_device(dev); free_dcr(dcr); - jcr->dcr = NULL; + if (was_reading) { + jcr->read_dcr = NULL; + } else { + jcr->dcr = NULL; + } + pthread_cond_broadcast(&wait_device_release); return ok; }