X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=bacula%2Fsrc%2Fstored%2Faskdir.c;h=b7fc61a113be361a6e6e8c51acc577005b50e0a5;hb=65f843b332c5fd751863c6dbbc2028ca46bdf2d6;hp=d449634709a204d3fd09181954d48f882b282061;hpb=ca4fb05c797d800d0bcf4bf04b77870df2dbcedb;p=bacula%2Fbacula diff --git a/bacula/src/stored/askdir.c b/bacula/src/stored/askdir.c index d449634709..b7fc61a113 100644 --- a/bacula/src/stored/askdir.c +++ b/bacula/src/stored/askdir.c @@ -7,22 +7,17 @@ * Version $Id$ */ /* - Copyright (C) 2000-2005 Kern Sibbald + Copyright (C) 2000-2006 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. */ @@ -77,7 +72,7 @@ bool dir_update_device(JCR *jcr, DEVICE *dev) pm_strcpy(dev_name, device->hdr.name); bash_spaces(dev_name); if (dev->is_labeled()) { - pm_strcpy(VolumeName, dev->VolHdr.VolName); + pm_strcpy(VolumeName, dev->VolHdr.VolumeName); } else { pm_strcpy(VolumeName, "*"); } @@ -167,7 +162,7 @@ static bool do_get_volume_info(DCR *dcr) return false; } memset(&vol, 0, sizeof(vol)); - Dmsg1(100, "msg); + Dmsg1(110, "msg); n = sscanf(dir->msg, OK_media, vol.VolCatName, &vol.VolCatJobs, &vol.VolCatFiles, &vol.VolCatBlocks, &vol.VolCatBytes, @@ -179,8 +174,8 @@ static bool do_get_volume_info(DCR *dcr) &vol.EndFile, &vol.EndBlock, &vol.VolCatParts, &vol.LabelType); if (n != 21) { - Dmsg2(100, "Bad response from Dir fields=%d: %s\n", n, dir->msg); - Mmsg(jcr->errmsg, _("Error getting Volume info: %s\n"), dir->msg); + Dmsg2(110, "Bad response from Dir fields=%d: %s", n, dir->msg); + Mmsg(jcr->errmsg, _("Error getting Volume info: %s"), dir->msg); return false; } vol.InChanger = InChanger; /* bool in structure */ @@ -188,7 +183,7 @@ static bool do_get_volume_info(DCR *dcr) bstrncpy(dcr->VolumeName, vol.VolCatName, sizeof(dcr->VolumeName)); memcpy(&dcr->VolCatInfo, &vol, sizeof(dcr->VolCatInfo)); - Dmsg2(300, "do_reqest_vol_info got slot=%d Volume=%s\n", + Dmsg2(300, "do_reqest_vol_info return true slot=%d Volume=%s\n", vol.Slot, vol.VolCatName); return true; } @@ -197,9 +192,9 @@ static bool do_get_volume_info(DCR *dcr) /* * Get Volume info for a specific volume from the Director's Database * - * Returns: true on success (not Director guarantees that Pool and MediaType - * are correct and VolStatus==Append or - * VolStatus==Recycle) + * Returns: true on success (Director guarantees that Pool and MediaType + * are correct and VolStatus==Append or + * VolStatus==Recycle) * false on failure * * Volume information returned in dcr->VolCatInfo @@ -214,7 +209,8 @@ bool dir_get_volume_info(DCR *dcr, enum get_vol_info_rw writing) bnet_fsend(dir, Get_Vol_Info, jcr->Job, dcr->VolCatInfo.VolCatName, writing==GET_VOL_INFO_FOR_WRITE?1:0); Dmsg1(100, ">dird: %s", dir->msg); - return do_get_volume_info(dcr); + bool ok = do_get_volume_info(dcr); + return ok; } @@ -231,55 +227,47 @@ bool dir_find_next_appendable_volume(DCR *dcr) { JCR *jcr = dcr->jcr; BSOCK *dir = jcr->dir_bsock; - JCR *njcr; + bool found = false; Dmsg0(200, "dir_find_next_appendable_volume\n"); /* - * Try the three oldest or most available volumes. Note, + * Try the twenty oldest or most available volumes. Note, * the most available could already be mounted on another * drive, so we continue looking for a not in use Volume. */ - for (int vol_index=1; vol_index < 3; vol_index++) { + lock_reservations(); + for (int vol_index=1; vol_index < 20; vol_index++) { bash_spaces(dcr->media_type); bash_spaces(dcr->pool_name); bnet_fsend(dir, Find_media, jcr->Job, vol_index, dcr->pool_name, dcr->media_type); unbash_spaces(dcr->media_type); unbash_spaces(dcr->pool_name); Dmsg1(100, ">dird: %s", dir->msg); - if (do_get_volume_info(dcr)) { - Dmsg2(300, "JobId=%d got possible Vol=%s\n", jcr->JobId, dcr->VolumeName); - bool found = false; - /* - * Walk through all jobs and see if the volume is - * already mounted. If so, try a different one. - * This would be better done by walking through - * all the devices. - */ - foreach_jcr(njcr) { - if (jcr == njcr) { - free_jcr(njcr); - continue; /* us */ - } - Dmsg2(300, "Compare to JobId=%d using Vol=%s\n", njcr->JobId, njcr->dcr->VolumeName); - if (njcr->dcr && strcmp(dcr->VolumeName, njcr->dcr->VolumeName) == 0) { - found = true; - Dmsg1(400, "Vol in use by JobId=%u\n", njcr->JobId); - free_jcr(njcr); - break; - } - free_jcr(njcr); - } - if (!found) { - Dmsg0(400, "dir_find_next_appendable_volume return true\n"); - return true; /* Got good Volume */ + bool ok = do_get_volume_info(dcr); + if (ok) { + if (dcr->any_volume || !is_volume_in_use(dcr)) { + found = true; + break; + } else { + Dmsg1(100, "Volume %s is in use.\n", dcr->VolumeName); + continue; } } else { - Dmsg0(200, "No volume info, return false\n"); - return false; + Dmsg2(100, "No vol. index %d return false. dev=%s\n", vol_index, + dcr->dev->print_name()); + found = false; + break; } } - Dmsg0(400, "dir_find_next_appendable_volume return true\n"); - return true; + if (found) { + Dmsg0(400, "dir_find_next_appendable_volume return true\n"); + new_volume(dcr, dcr->VolumeName); /* reserve volume */ + unlock_reservations(); + return true; + } + dcr->VolumeName[0] = 0; + unlock_reservations(); + return false; } @@ -301,16 +289,16 @@ bool dir_update_volume_info(DCR *dcr, bool label) if (vol->VolCatName[0] == 0) { Jmsg0(jcr, M_FATAL, 0, _("NULL Volume name. This shouldn't happen!!!\n")); - Pmsg0(000, "NULL Volume name. This shouldn't happen!!!\n"); + Pmsg0(000, _("NULL Volume name. This shouldn't happen!!!\n")); return false; } if (dev->can_read()) { Jmsg0(jcr, M_FATAL, 0, _("Attempt to update_volume_info in read mode!!!\n")); - Pmsg0(000, "Attempt to update_volume_info in read mode!!!\n"); + Pmsg0(000, _("Attempt to update_volume_info in read mode!!!\n")); return false; } - Dmsg1(300, "Update cat VolFiles=%d\n", dev->file); + Dmsg1(100, "Update cat VolFiles=%d\n", dev->file); /* Just labeled or relabeled the tape */ if (label) { bstrncpy(vol->VolCatStatus, "Append", sizeof(vol->VolCatStatus)); @@ -331,9 +319,10 @@ bool dir_update_volume_info(DCR *dcr, bool label) vol->VolCatParts); Dmsg1(100, ">dird: %s", dir->msg); + /* Do not lock device here because it may be locked from label */ if (!do_get_volume_info(dcr)) { Jmsg(jcr, M_FATAL, 0, "%s", jcr->errmsg); - Pmsg2(000, "Didn't get vol info vol=%s: ERR=%s", + Pmsg2(000, _("Didn't get vol info vol=%s: ERR=%s"), vol->VolCatName, jcr->errmsg); return false; } @@ -427,11 +416,10 @@ bool dir_update_file_attributes(DCR *dcr, DEV_RECORD *rec) */ bool dir_ask_sysop_to_create_appendable_volume(DCR *dcr) { - int stat = 0, jstat; - bool unmounted; - bool first = true; + int stat = W_TIMEOUT; DEVICE *dev = dcr->dev; JCR *jcr = dcr->jcr; + bool got_vol = false; Dmsg0(400, "enter dir_ask_sysop_to_create_appendable_volume\n"); ASSERT(dev->dev_blocked); @@ -443,34 +431,13 @@ bool dir_ask_sysop_to_create_appendable_volume(DCR *dcr) Jmsg(jcr, M_INFO, 0, "%s", dev->errmsg); return false; } - /* First pass, we *know* there are no appendable volumes, so no need to call */ - if (!first && dir_find_next_appendable_volume(dcr)) { /* get suggested volume */ - unmounted = (dev->dev_blocked == BST_UNMOUNTED) || - (dev->dev_blocked == BST_UNMOUNTED_WAITING_FOR_SYSOP); - /* - * If we have a valid volume name and we are not - * removable media, return now, or if we have a - * Slot for an autochanger, otherwise wait - * for the operator to mount the media. - */ - if (!unmounted && ((dcr->VolumeName[0] && !dev_cap(dev, CAP_REM) && - dev_cap(dev, CAP_LABEL)) || - (dcr->VolumeName[0] && dcr->VolCatInfo.Slot))) { - Dmsg0(400, "Return 1 from mount without wait.\n"); - return true; - } - jstat = JS_WaitMount; - if (!dev->poll) { - Jmsg(jcr, M_MOUNT, 0, _( -"Please mount Volume \"%s\" on Storage Device %s for Job %s\n" -"Use \"mount\" command to release Job.\n"), - dcr->VolumeName, dev->print_name(), jcr->Job); - Dmsg3(400, "Mount %s on %s for Job %s\n", - dcr->VolumeName, dcr->dev_name, jcr->Job); - } + P(dev->mutex); + got_vol = dir_find_next_appendable_volume(dcr); /* get suggested volume */ + V(dev->mutex); + if (got_vol) { + return true; } else { - jstat = JS_WaitMedia; - if (!dev->poll) { + if (stat == W_TIMEOUT || stat == W_MOUNT) { Jmsg(jcr, M_MOUNT, 0, _( "Job %s waiting. Cannot find any appendable volumes.\n" "Please use the \"label\" command to create a new Volume for:\n" @@ -483,65 +450,38 @@ bool dir_ask_sysop_to_create_appendable_volume(DCR *dcr) dcr->pool_name); } } - first = false; - jcr->JobStatus = jstat; + jcr->JobStatus = JS_WaitMedia; dir_send_job_status(jcr); stat = wait_for_sysop(dcr); + Dmsg1(100, "Back from wait_for_sysop stat=%d\n", stat); if (dev->poll) { - Dmsg1(400, "Poll timeout in create append vol on device %s\n", dev->print_name()); + Dmsg1(100, "Poll timeout in create append vol on device %s\n", dev->print_name()); continue; } - if (stat == ETIMEDOUT) { + if (stat == W_TIMEOUT) { if (!double_dev_wait_time(dev)) { Mmsg(dev->errmsg, _("Max time exceeded waiting to mount Storage Device %s for Job %s\n"), dev->print_name(), jcr->Job); Jmsg(jcr, M_FATAL, 0, "%s", dev->errmsg); - Dmsg1(400, "Gave up waiting on device %s\n", dev->print_name()); + Dmsg1(100, "Gave up waiting on device %s\n", dev->print_name()); return false; /* exceeded maximum waits */ } continue; } - if (stat == EINVAL) { + if (stat == W_ERROR) { berrno be; - Mmsg2(dev->errmsg, _("pthread error in mount_next_volume stat=%d ERR=%s\n"), - stat, be.strerror(stat)); + Mmsg0(dev->errmsg, _("pthread error in mount_next_volume.\n")); Jmsg(jcr, M_FATAL, 0, "%s", dev->errmsg); return false; } - if (stat != 0) { - berrno be; - Jmsg(jcr, M_WARNING, 0, _("pthread error in mount_next_volume stat=%d ERR=%s\n"), stat, - be.strerror(stat)); - } - Dmsg1(400, "Someone woke me for device %s\n", dev->print_name()); - - /* If no VolumeName, and cannot get one, try again */ - if (dcr->VolumeName[0] == 0 && !job_canceled(jcr) && - !dir_find_next_appendable_volume(dcr)) { - Jmsg(jcr, M_MOUNT, 0, _( -"Someone woke me up, but I cannot find any appendable\n" -"volumes for Job=%s.\n"), jcr->Job); - /* Restart wait counters after user interaction */ - init_device_wait_timers(dcr); - continue; - } - unmounted = (dev->dev_blocked == BST_UNMOUNTED) || - (dev->dev_blocked == BST_UNMOUNTED_WAITING_FOR_SYSOP); - if (unmounted) { - continue; /* continue to wait */ - } - - /* - * Device mounted, we have a volume, break and return - */ - break; + Dmsg1(100, "Someone woke me for device %s\n", dev->print_name()); } set_jcr_job_status(jcr, JS_Running); dir_send_job_status(jcr); - Dmsg0(400, "leave dir_ask_sysop_to_mount_create_appendable_volume\n"); + Dmsg0(100, "leave dir_ask_sysop_to_mount_create_appendable_volume\n"); return true; } @@ -559,8 +499,7 @@ bool dir_ask_sysop_to_create_appendable_volume(DCR *dcr) */ bool dir_ask_sysop_to_mount_volume(DCR *dcr) { - int stat = 0; - const char *msg; + int stat = W_TIMEOUT; DEVICE *dev = dcr->dev; JCR *jcr = dcr->jcr; @@ -577,25 +516,34 @@ bool dir_ask_sysop_to_mount_volume(DCR *dcr) return false; } - if (!dev->poll) { - msg = _("Please mount"); - Jmsg(jcr, M_MOUNT, 0, _("%s Volume \"%s\" on Storage Device %s for Job %s\n"), - msg, dcr->VolumeName, dev->print_name(), jcr->Job); + if (dev->is_dvd()) { + unmount_dvd(dev, 0); + } + + /* + * If we are not polling, and the wait timeout or the + * user explicitly did a mount, send him the message. + * Otherwise skip it. + */ + if (!dev->poll && (stat == W_TIMEOUT || stat == W_MOUNT)) { + Jmsg(jcr, M_MOUNT, 0, _("Please mount Volume \"%s\" on Storage Device %s for Job %s\n"), + dcr->VolumeName, dev->print_name(), jcr->Job); Dmsg3(400, "Mount \"%s\" on device \"%s\" for Job %s\n", - dcr->VolumeName, dcr->dev_name, jcr->Job); + dcr->VolumeName, dev->print_name(), jcr->Job); } jcr->JobStatus = JS_WaitMount; dir_send_job_status(jcr); - stat = wait_for_sysop(dcr); ; /* wait on device */ + stat = wait_for_sysop(dcr); /* wait on device */ + Dmsg1(100, "Back from wait_for_sysop stat=%d\n", stat); if (dev->poll) { Dmsg1(400, "Poll timeout in mount vol on device %s\n", dev->print_name()); - Dmsg1(400, "Blocked=%s\n", edit_blocked_reason(dev)); + Dmsg1(400, "Blocked=%s\n", dev->print_blocked()); return true; } - if (stat == ETIMEDOUT) { + if (stat == W_TIMEOUT) { if (!double_dev_wait_time(dev)) { Mmsg(dev->errmsg, _("Max time exceeded waiting to mount Storage Device %s for Job %s\n"), dev->print_name(), jcr->Job); @@ -605,18 +553,12 @@ bool dir_ask_sysop_to_mount_volume(DCR *dcr) } continue; } - if (stat == EINVAL) { + if (stat == W_ERROR) { berrno be; - Mmsg2(dev->errmsg, _("pthread error in mount_volume stat=%d ERR=%s\n"), - stat, be.strerror(stat)); + Mmsg(dev->errmsg, _("pthread error in mount_volume\n")); Jmsg(jcr, M_FATAL, 0, "%s", dev->errmsg); return false; } - if (stat != 0) { - berrno be; - Jmsg(jcr, M_FATAL, 0, _("pthread error in mount_next_volume stat=%d: ERR=%s\n"), stat, - be.strerror(stat)); - } Dmsg1(400, "Someone woke me for device %s\n", dev->print_name()); break; }