X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fstored%2Fdircmd.c;h=a7b631a8311ab2b069c55360cc89a3acaab936ba;hb=bc9b9b481e86991abd879d30aa03b64b4c68d578;hp=aee4e99270120692588287180524f712896ee757;hpb=cb0e471ccc2e97d55c56a6a6285a098072675fc5;p=bacula%2Fbacula diff --git a/bacula/src/stored/dircmd.c b/bacula/src/stored/dircmd.c index aee4e99270..a7b631a831 100644 --- a/bacula/src/stored/dircmd.c +++ b/bacula/src/stored/dircmd.c @@ -1,3 +1,30 @@ +/* + Bacula® - The Network Backup Solution + + Copyright (C) 2001-2008 Free Software Foundation Europe e.V. + + The main author of Bacula is Kern Sibbald, with contributions from + many others, a complete list can be found in the file AUTHORS. + This program is Free Software; you can redistribute it and/or + modify it under the terms of version two of the GNU General Public + License as published by the Free Software Foundation and included + in the file LICENSE. + + 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., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. + + Bacula® is a registered trademark of John Walker. + The licensor of Bacula is the Free Software Foundation Europe + (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich, + Switzerland, email:ftf@fsfeurope.org. +*/ /* * This file handles accepting Director Commands * @@ -7,9 +34,10 @@ * in job.c. * * N.B. in this file, in general we must use P(dev->mutex) rather - * than lock_device(dev) so that we can examine the blocked - * state rather than blocking ourselves. In some "safe" cases, - * we can do things to a blocked device. CAREFUL!!!! + * than dev->r_lock() so that we can examine the blocked + * state rather than blocking ourselves because a Job + * thread has the device blocked. In some "safe" cases, + * we can do things to a blocked device. CAREFUL!!!! * * File daemon commands are handled in fdcmd.c * @@ -18,25 +46,6 @@ * Version $Id$ * */ -/* - Copyright (C) 2001-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. - - 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. - - */ #include "bacula.h" #include "stored.h" @@ -47,14 +56,13 @@ extern BSOCK *filed_chan; extern int r_first, r_last; extern struct s_res resources[]; -extern char my_name[]; -extern time_t daemon_start_time; extern struct s_last_job last_job; +extern bool init_done; /* Static variables */ static char derrmsg[] = "3900 Invalid command\n"; static char OKsetdebug[] = "3000 OK setdebug=%d\n"; -static char illegal_cmd[] = "3997 Illegal command for a Director with Monitor directive enabled\n"; +static char invalid_cmd[] = "3997 Invalid command for a Director with Monitor directive enabled.\n"; /* Imported functions */ extern void terminate_child(); @@ -63,10 +71,11 @@ extern bool use_cmd(JCR *jcr); extern bool run_cmd(JCR *jcr); extern bool status_cmd(JCR *sjcr); extern bool qstatus_cmd(JCR *jcr); -extern bool query_cmd(JCR *jcr); +//extern bool query_cmd(JCR *jcr); /* Forward referenced functions */ static bool label_cmd(JCR *jcr); +static bool die_cmd(JCR *jcr); static bool relabel_cmd(JCR *jcr); static bool readlabel_cmd(JCR *jcr); static bool release_cmd(JCR *jcr); @@ -74,14 +83,15 @@ static bool setdebug_cmd(JCR *jcr); static bool cancel_cmd(JCR *cjcr); static bool mount_cmd(JCR *jcr); static bool unmount_cmd(JCR *jcr); -static bool autochanger_cmd(JCR *sjcr); +static bool bootstrap_cmd(JCR *jcr); +static bool changer_cmd(JCR *sjcr); static bool do_label(JCR *jcr, int relabel); -static DEVICE *find_device(JCR *jcr, POOL_MEM &dev_name); -static void read_volume_label(JCR *jcr, DEVICE *dev, int Slot); -static void label_volume_if_ok(JCR *jcr, DEVICE *dev, char *oldname, - char *newname, char *poolname, - int Slot, int relabel); -static bool try_autoload_device(JCR *jcr, int slot, const char *VolName); +static DCR *find_device(JCR *jcr, POOL_MEM &dev_name, int drive); +static void read_volume_label(JCR *jcr, DCR *dcr, DEVICE *dev, int Slot); +static void label_volume_if_ok(DCR *dcr, char *oldname, + char *newname, char *poolname, + int Slot, int relabel); +static bool try_autoload_device(JCR *jcr, DCR *dcr, int slot, const char *VolName); static void send_dir_busy_message(BSOCK *dir, DEVICE *dev); struct s_cmds { @@ -95,9 +105,10 @@ struct s_cmds { */ static struct s_cmds cmds[] = { {"JobId=", job_cmd, 0}, /* start Job */ - {"autochanger", autochanger_cmd, 0}, + {"autochanger", changer_cmd, 0}, {"bootstrap", bootstrap_cmd, 0}, {"cancel", cancel_cmd, 0}, + {".die", die_cmd, 0}, {"label", label_cmd, 0}, /* label a tape */ {"mount", mount_cmd, 0}, {"readlabel", readlabel_cmd, 0}, @@ -107,10 +118,10 @@ static struct s_cmds cmds[] = { {"status", status_cmd, 1}, {".status", qstatus_cmd, 1}, {"unmount", unmount_cmd, 0}, - {"use device=", use_cmd, 0}, + {"use storage=", use_cmd, 0}, {"run", run_cmd, 0}, - {"query", query_cmd, 0}, - {NULL, NULL} /* list terminator */ +// {"query", query_cmd, 0}, + {NULL, NULL} /* list terminator */ }; @@ -137,41 +148,50 @@ void *handle_connection_request(void *arg) int i; bool found, quit; int bnet_stat = 0; - char name[MAX_NAME_LENGTH]; + char name[500]; - if (bnet_recv(bs) <= 0) { + if (bs->recv() <= 0) { Emsg0(M_ERROR, 0, _("Connection request failed.\n")); - bnet_close(bs); + bs->close(); return NULL; } /* * Do a sanity check on the message received */ - if (bs->msglen < 25 || bs->msglen > (int)sizeof(name)-25) { + if (bs->msglen < 25 || bs->msglen > (int)sizeof(name)) { + Dmsg1(000, "msg); Emsg1(M_ERROR, 0, _("Invalid connection. Len=%d\n"), bs->msglen); - bnet_close(bs); + bs->close(); return NULL; } /* * See if this is a File daemon connection. If so - * call FD handler. + * call FD handler. */ Dmsg1(110, "Conn: %s", bs->msg); + if (debug_level == 3) { + Dmsg1(000, "msg); + } if (sscanf(bs->msg, "Hello Start Job %127s", name) == 1) { + Dmsg0(110, "Got a FD connection\n"); handle_filed_connection(bs, name); return NULL; } - Dmsg0(110, "Start Dir Job\n"); + /* + * This is a connection from the Director, so setup a JCR + */ + Dmsg0(110, "Got a DIR connection\n"); jcr = new_jcr(sizeof(JCR), stored_free_jcr); /* create Job Control Record */ - jcr->dir_bsock = bs; /* save Director bsock */ - jcr->dir_bsock->jcr = jcr; + jcr->dir_bsock = bs; /* save Director bsock */ + jcr->dir_bsock->set_jcr(jcr); jcr->dcrs = New(alist(10, not_owned_by_alist)); /* Initialize FD start condition variable */ int errstat = pthread_cond_init(&jcr->job_start_wait, NULL); if (errstat != 0) { - Jmsg1(jcr, M_FATAL, 0, _("Unable to init job cond variable: ERR=%s\n"), strerror(errstat)); + berrno be; + Jmsg1(jcr, M_FATAL, 0, _("Unable to init job cond variable: ERR=%s\n"), be.bstrerror(errstat)); goto bail_out; } @@ -188,40 +208,63 @@ void *handle_connection_request(void *arg) for (quit=false; !quit;) { /* Read command */ - if ((bnet_stat = bnet_recv(bs)) <= 0) { - break; /* connection terminated */ + if ((bnet_stat = bs->recv()) <= 0) { + break; /* connection terminated */ } Dmsg1(199, "msg); + /* Ensure that device initialization is complete */ + while (!init_done) { + bmicrosleep(1, 0); + } found = false; for (i=0; cmds[i].cmd; i++) { - if (strncmp(cmds[i].cmd, bs->msg, strlen(cmds[i].cmd)) == 0) { - if ((!cmds[i].monitoraccess) && (jcr->director->monitor)) { - Dmsg1(100, "Command %s illegal.\n", cmds[i].cmd); - bnet_fsend(bs, illegal_cmd); - bnet_sig(bs, BNET_EOD); - break; - } + if (strncmp(cmds[i].cmd, bs->msg, strlen(cmds[i].cmd)) == 0) { + if ((!cmds[i].monitoraccess) && (jcr->director->monitor)) { + Dmsg1(100, "Command \"%s\" is invalid.\n", cmds[i].cmd); + bs->fsend(invalid_cmd); + bs->signal(BNET_EOD); + break; + } Dmsg1(200, "Do command: %s\n", cmds[i].cmd); - if (!cmds[i].func(jcr)) { /* do command */ - quit = true; /* error, get out */ - Dmsg1(190, "Command %s requsts quit\n", cmds[i].cmd); - } - found = true; /* indicate command found */ - break; - } + if (!cmds[i].func(jcr)) { /* do command */ + quit = true; /* error, get out */ + Dmsg1(190, "Command %s reqeusts quit\n", cmds[i].cmd); + } + found = true; /* indicate command found */ + break; + } } - if (!found) { /* command not found */ - bnet_fsend(bs, derrmsg); - break; + if (!found) { /* command not found */ + bs->fsend(derrmsg); + break; } } bail_out: - dequeue_messages(jcr); /* send any queued messages */ - bnet_sig(bs, BNET_TERMINATE); + generate_daemon_event(jcr, "JobEnd"); + dequeue_messages(jcr); /* send any queued messages */ + bs->signal(BNET_TERMINATE); free_jcr(jcr); return NULL; } + +/* + * Force SD to die, and hopefully dump itself. Turned on only + * in development version. + */ +static bool die_cmd(JCR *jcr) +{ +#ifdef DEVELOPER + JCR *djcr = NULL; + int a; + Pmsg0(000, "I have been requested to die ..."); + a = djcr->JobId; /* ref NULL pointer */ +#endif + return 0; +} + + + /* * Set debug level as requested by the Director * @@ -233,12 +276,12 @@ static bool setdebug_cmd(JCR *jcr) Dmsg1(10, "setdebug_cmd: %s", dir->msg); if (sscanf(dir->msg, "setdebug=%d trace=%d", &level, &trace_flag) != 2 || level < 0) { - bnet_fsend(dir, "3991 Bad setdebug command: %s\n", dir->msg); + dir->fsend(_("3991 Bad setdebug command: %s\n"), dir->msg); return 0; } debug_level = level; set_trace(trace_flag); - return bnet_fsend(dir, OKsetdebug, level); + return dir->fsend(OKsetdebug, level); } @@ -254,37 +297,43 @@ static bool cancel_cmd(JCR *cjcr) if (sscanf(dir->msg, "cancel Job=%127s", Job) == 1) { if (!(jcr=get_jcr_by_full_name(Job))) { - bnet_fsend(dir, _("3992 Job %s not found.\n"), Job); + dir->fsend(_("3904 Job %s not found.\n"), Job); } else { - P(jcr->mutex); - oldStatus = jcr->JobStatus; - set_jcr_job_status(jcr, JS_Canceled); - if (!jcr->authenticated && oldStatus == JS_WaitFD) { - pthread_cond_signal(&jcr->job_start_wait); /* wake waiting thread */ - } - V(jcr->mutex); - if (jcr->file_bsock) { - bnet_sig(jcr->file_bsock, BNET_TERMINATE); - } - /* If thread waiting on mount, wake him */ - if (jcr->dcr && jcr->dcr->dev && - (jcr->dcr->dev->dev_blocked == BST_WAITING_FOR_SYSOP || - jcr->dcr->dev->dev_blocked == BST_UNMOUNTED || - jcr->dcr->dev->dev_blocked == BST_UNMOUNTED_WAITING_FOR_SYSOP)) { - pthread_cond_signal(&jcr->dcr->dev->wait_next_vol); - } - bnet_fsend(dir, _("3000 Job %s marked to be canceled.\n"), jcr->Job); - free_jcr(jcr); + oldStatus = jcr->JobStatus; + set_jcr_job_status(jcr, JS_Canceled); + if (!jcr->authenticated && oldStatus == JS_WaitFD) { + pthread_cond_signal(&jcr->job_start_wait); /* wake waiting thread */ + } + if (jcr->file_bsock) { + bnet_sig(jcr->file_bsock, BNET_TERMINATE); + } else { + /* Still waiting for FD to connect, release it */ + pthread_cond_signal(&jcr->job_start_wait); /* wake waiting job */ + } + /* If thread waiting on mount, wake him */ + if (jcr->dcr && jcr->dcr->dev && jcr->dcr->dev->waiting_for_mount()) { + pthread_cond_broadcast(&jcr->dcr->dev->wait_next_vol); + Dmsg1(100, "JobId=%u broadcast wait_device_release\n", (uint32_t)jcr->JobId); + pthread_cond_broadcast(&wait_device_release); + } + if (jcr->read_dcr && jcr->read_dcr->dev && jcr->read_dcr->dev->waiting_for_mount()) { + pthread_cond_broadcast(&jcr->read_dcr->dev->wait_next_vol); + Dmsg1(100, "JobId=%u broadcast wait_device_release\n", (uint32_t)jcr->JobId); + pthread_cond_broadcast(&wait_device_release); + } + Jmsg(jcr, M_INFO, 0, _("Job %s marked to be canceled.\n"), jcr->Job); + dir->fsend(_("3000 Job %s marked to be canceled.\n"), jcr->Job); + free_jcr(jcr); } } else { - bnet_fsend(dir, _("3993 Error scanning cancel command.\n")); + dir->fsend(_("3903 Error scanning cancel command.\n")); } - bnet_sig(dir, BNET_EOD); + dir->signal(BNET_EOD); return 1; } /* - * Label a tape + * Label a Volume * */ static bool label_cmd(JCR *jcr) @@ -302,24 +351,29 @@ static bool do_label(JCR *jcr, int relabel) POOLMEM *newname, *oldname, *poolname, *mtype; POOL_MEM dev_name; BSOCK *dir = jcr->dir_bsock; + DCR *dcr; DEVICE *dev; bool ok = false; int slot; + int drive; newname = get_memory(dir->msglen+1); oldname = get_memory(dir->msglen+1); poolname = get_memory(dir->msglen+1); mtype = get_memory(dir->msglen+1); if (relabel) { - if (sscanf(dir->msg, "relabel %127s OldName=%127s NewName=%127s PoolName=%127s MediaType=%127s Slot=%d", - dev_name.c_str(), oldname, newname, poolname, mtype, &slot) == 6) { - ok = true; + if (sscanf(dir->msg, "relabel %127s OldName=%127s NewName=%127s PoolName=%127s " + "MediaType=%127s Slot=%d drive=%d", + dev_name.c_str(), oldname, newname, poolname, mtype, + &slot, &drive) == 7) { + ok = true; } } else { *oldname = 0; - if (sscanf(dir->msg, "label %127s VolumeName=%127s PoolName=%127s MediaType=%127s Slot=%d", - dev_name.c_str(), newname, poolname, mtype, &slot) == 5) { - ok = true; + if (sscanf(dir->msg, "label %127s VolumeName=%127s PoolName=%127s " + "MediaType=%127s Slot=%d drive=%d", + dev_name.c_str(), newname, poolname, mtype, &slot, &drive) == 6) { + ok = true; } } if (ok) { @@ -327,38 +381,39 @@ static bool do_label(JCR *jcr, int relabel) unbash_spaces(oldname); unbash_spaces(poolname); unbash_spaces(mtype); - dev = find_device(jcr, dev_name); - if (dev) { - /******FIXME**** compare MediaTypes */ - P(dev->mutex); /* Use P to avoid indefinite block */ - if (!dev->is_open()) { - label_volume_if_ok(jcr, dev, oldname, newname, poolname, slot, relabel); - force_close_dev(dev); + dcr = find_device(jcr, dev_name, drive); + if (dcr) { + dev = dcr->dev; + dev->dlock(); /* Use P to avoid indefinite block */ + if (!dev->is_open()) { + Dmsg1(400, "Can %slabel. Device is not open\n", relabel?"re":""); + label_volume_if_ok(dcr, oldname, newname, poolname, slot, relabel); + dev->close(); /* Under certain "safe" conditions, we can steal the lock */ - } else if (dev->dev_blocked && - (dev->dev_blocked == BST_UNMOUNTED || - dev->dev_blocked == BST_WAITING_FOR_SYSOP || - dev->dev_blocked == BST_UNMOUNTED_WAITING_FOR_SYSOP)) { - label_volume_if_ok(jcr, dev, oldname, newname, poolname, slot, relabel); - } else if (dev->is_busy()) { - send_dir_busy_message(dir, dev); - } else { /* device not being used */ - label_volume_if_ok(jcr, dev, oldname, newname, poolname, slot, relabel); - } - V(dev->mutex); + } else if (dev->can_steal_lock()) { + Dmsg0(400, "Can relabel. can_steal_lock\n"); + label_volume_if_ok(dcr, oldname, newname, poolname, slot, relabel); + } else if (dev->is_busy() || dev->is_blocked()) { + send_dir_busy_message(dir, dev); + } else { /* device not being used */ + Dmsg0(400, "Can relabel. device not used\n"); + label_volume_if_ok(dcr, oldname, newname, poolname, slot, relabel); + } + dev->dunlock(); + free_dcr(dcr); } else { - bnet_fsend(dir, _("3999 Device \"%s\" not found\n"), dev_name.c_str()); + dir->fsend(_("3999 Device \"%s\" not found or could not be opened.\n"), dev_name.c_str()); } } else { /* NB dir->msg gets clobbered in bnet_fsend, so save command */ pm_strcpy(jcr->errmsg, dir->msg); - bnet_fsend(dir, _("3903 Error scanning label command: %s\n"), jcr->errmsg); + dir->fsend(_("3903 Error scanning label command: %s\n"), jcr->errmsg); } free_memory(oldname); free_memory(newname); free_memory(poolname); free_memory(mtype); - bnet_sig(dir, BNET_EOD); + dir->signal(BNET_EOD); return true; } @@ -368,71 +423,99 @@ static bool do_label(JCR *jcr, int relabel) * * Enter with the mutex set */ -static void label_volume_if_ok(JCR *jcr, DEVICE *dev, char *oldname, - char *newname, char *poolname, - int slot, int relabel) +static void label_volume_if_ok(DCR *dcr, char *oldname, + char *newname, char *poolname, + int slot, int relabel) { - BSOCK *dir = jcr->dir_bsock; + BSOCK *dir = dcr->jcr->dir_bsock; bsteal_lock_t hold; - DCR *dcr = jcr->dcr; + DEVICE *dev = dcr->dev; int label_status; + int mode; + const char *volname = (relabel == 1) ? oldname : newname; + char ed1[50]; - dcr->dev = dev; steal_device_lock(dev, &hold, BST_WRITING_LABEL); + Dmsg1(100, "Stole device %s lock, writing label.\n", dev->print_name()); + - if (!try_autoload_device(jcr, slot, newname)) { - goto bail_out; /* error */ + Dmsg0(90, "try_autoload_device - looking for volume_info\n"); + if (!try_autoload_device(dcr->jcr, dcr, slot, volname)) { + goto bail_out; /* error */ } - /* See what we have for a Volume */ - if (dev->is_dvd()) { - label_status = read_dev_volume_label_guess(dcr, 1); + /* Ensure that the device is open -- autoload_device() closes it */ + if (dev->is_tape()) { + mode = OPEN_READ_WRITE; } else { - label_status = read_dev_volume_label(dcr); + mode = CREATE_READ_WRITE; + } + + if (relabel) { + dev->truncating = true; /* let open() know we will truncate it */ + } + /* Set old volume name for open if relabeling */ + bstrncpy(dcr->VolCatInfo.VolCatName, volname, sizeof(dcr->VolCatInfo.VolCatName)); + if (dev->open(dcr, mode) < 0) { + dir->fsend(_("3910 Unable to open device %s: ERR=%s\n"), + dev->print_name(), dev->bstrerror()); + goto bail_out; } + + /* See what we have for a Volume */ + label_status = read_dev_volume_label(dcr); + /* Set new volume name */ + bstrncpy(dcr->VolCatInfo.VolCatName, newname, sizeof(dcr->VolCatInfo.VolCatName)); switch(label_status) { case VOL_NAME_ERROR: case VOL_VERSION_ERROR: case VOL_LABEL_ERROR: case VOL_OK: if (!relabel) { - bnet_fsend(dir, _( + dir->fsend(_( "3920 Cannot label Volume because it is already labeled: \"%s\"\n"), - dev->VolHdr.VolName); - break; + dev->VolHdr.VolumeName); + break; } + /* Relabel request. If oldname matches, continue */ - if (strcmp(oldname, dev->VolHdr.VolName) != 0) { - bnet_fsend(dir, _("3921 Wrong volume mounted.\n")); - break; + if (strcmp(oldname, dev->VolHdr.VolumeName) != 0) { + dir->fsend(_("3921 Wrong volume mounted.\n")); + break; } if (dev->label_type != B_BACULA_LABEL) { - bnet_fsend(dir, _("3922 Cannot relabel an ANSI/IBM labeled Volume.\n")); - break; + dir->fsend(_("3922 Cannot relabel an ANSI/IBM labeled Volume.\n")); + break; } /* Fall through wanted! */ case VOL_IO_ERROR: case VOL_NO_LABEL: - if (!write_new_volume_label_to_dev(dcr, newname, poolname)) { - bnet_fsend(dir, _("3912 Failed to label Volume: ERR=%s\n"), strerror_dev(dev)); - break; + if (!write_new_volume_label_to_dev(dcr, newname, poolname, + relabel, true /* write dvd now */)) { + dir->fsend(_("3912 Failed to label Volume: ERR=%s\n"), dev->bstrerror()); + break; } bstrncpy(dcr->VolumeName, newname, sizeof(dcr->VolumeName)); /* The following 3000 OK label. string is scanned in ua_label.c */ - bnet_fsend(dir, "3000 OK label. Volume=%s Device=\"%s\" (%s)\n", - newname, dev->name(), dev->archive_name()); + dir->fsend("3000 OK label. VolBytes=%s DVD=%d Volume=\"%s\" Device=%s\n", + edit_uint64(dev->VolCatInfo.VolCatBytes, ed1), + dev->is_dvd()?1:0, newname, dev->print_name()); break; case VOL_NO_MEDIA: - bnet_fsend(dir, _("3912 Failed to label Volume: ERR=%s\n"), strerror_dev(dev)); + dir->fsend(_("3914 Failed to label Volume (no media): ERR=%s\n"), dev->bstrerror()); break; default: - bnet_fsend(dir, _("3913 Cannot label Volume. " + dir->fsend(_("3913 Cannot label Volume. " "Unknown status %d from read_volume_label()\n"), label_status); break; } bail_out: + if (!dev->is_open()) { + dev->clear_volhdr(); + } + volume_unused(dcr); /* no longer using volume */ give_back_device_lock(dev, &hold); return; } @@ -454,82 +537,92 @@ static bool read_label(DCR *dcr) steal_device_lock(dev, &hold, BST_DOING_ACQUIRE); dcr->VolumeName[0] = 0; - dev->state &= ~ST_LABEL; /* force read of label */ + dev->clear_labeled(); /* force read of label */ switch (read_dev_volume_label(dcr)) { case VOL_OK: - bnet_fsend(dir, _("3001 Mounted Volume: %s\n"), dev->VolHdr.VolName); + dir->fsend(_("3001 Mounted Volume: %s\n"), dev->VolHdr.VolumeName); ok = true; break; default: - bnet_fsend(dir, _("3902 Cannot mount Volume on Storage Device \"%s\" (%s) because:\n%s"), - dev->name(), dev->archive_name(), jcr->errmsg); + dir->fsend(_("3902 Cannot mount Volume on Storage Device %s because:\n%s"), + dev->print_name(), jcr->errmsg); ok = false; break; } + volume_unused(dcr); give_back_device_lock(dev, &hold); return ok; } -static DEVICE *find_device(JCR *jcr, POOL_MEM &devname) +/* + * Searches for device by name, and if found, creates a dcr and + * returns it. + */ +static DCR *find_device(JCR *jcr, POOL_MEM &devname, int drive) { DEVRES *device; AUTOCHANGER *changer; bool found = false; + DCR *dcr = NULL; unbash_spaces(devname); - LockRes(); foreach_res(device, R_DEVICE) { /* Find resource, and make sure we were able to open it */ - if (fnmatch(device->hdr.name, devname.c_str(), 0) == 0) { - if (!device->dev) { - device->dev = init_dev(jcr, NULL, device); - } - if (!device->dev) { + if (strcmp(device->hdr.name, devname.c_str()) == 0) { + if (!device->dev) { + device->dev = init_dev(jcr, device); + } + if (!device->dev) { Jmsg(jcr, M_WARNING, 0, _("\n" " Device \"%s\" requested by DIR could not be opened or does not exist.\n"), - devname.c_str()); - continue; - } + devname.c_str()); + continue; + } Dmsg1(20, "Found device %s\n", device->hdr.name); - found = true; - break; + found = true; + break; } } - foreach_res(changer, R_AUTOCHANGER) { - /* Find resource, and make sure we were able to open it */ - if (fnmatch(devname.c_str(), changer->hdr.name, 0) == 0) { - /* Try each device in this AutoChanger */ - foreach_alist(device, changer->device) { - Dmsg1(100, "Try changer device %s\n", device->hdr.name); - if (!device->dev) { - device->dev = init_dev(jcr, NULL, device); - } - if (!device->dev) { - Dmsg1(100, "Device %s could not be opened. Skipped\n", devname.c_str()); - Jmsg(jcr, M_WARNING, 0, _("\n" - " Device \"%s\" in changer \"%s\" requested by DIR could not be opened or does not exist.\n"), - device->hdr.name, devname.c_str()); - continue; - } - if (!device->dev->autoselect) { - continue; /* device is not available */ - } - Dmsg1(20, "Found changer device %s\n", device->hdr.name); - found = true; - break; - } - break; /* we found it but could not open a device */ + if (!found) { + foreach_res(changer, R_AUTOCHANGER) { + /* Find resource, and make sure we were able to open it */ + if (strcmp(devname.c_str(), changer->hdr.name) == 0) { + /* Try each device in this AutoChanger */ + foreach_alist(device, changer->device) { + Dmsg1(100, "Try changer device %s\n", device->hdr.name); + if (!device->dev) { + device->dev = init_dev(jcr, device); + } + if (!device->dev) { + Dmsg1(100, "Device %s could not be opened. Skipped\n", devname.c_str()); + Jmsg(jcr, M_WARNING, 0, _("\n" + " Device \"%s\" in changer \"%s\" requested by DIR could not be opened or does not exist.\n"), + device->hdr.name, devname.c_str()); + continue; + } + if (!device->dev->autoselect) { + Dmsg1(100, "Device %s not autoselect skipped.\n", devname.c_str()); + continue; /* device is not available */ + } + if (drive < 0 || drive == (int)device->dev->drive_index) { + Dmsg1(20, "Found changer device %s\n", device->hdr.name); + found = true; + break; + } + Dmsg3(100, "Device %s drive wrong: want=%d got=%d skipping\n", + devname.c_str(), drive, (int)device->dev->drive_index); + } + break; /* we found it but could not open a device */ + } } } if (found) { - jcr->dcr = new_dcr(jcr, device->dev); - UnlockRes(); - jcr->dcr->device = device; - return jcr->dcr->dev; + Dmsg1(100, "Found device %s\n", device->hdr.name); + dcr = new_dcr(jcr, NULL, device->dev); + dcr->device = device; } - UnlockRes(); - return NULL; + return dcr; } @@ -542,107 +635,138 @@ static bool mount_cmd(JCR *jcr) BSOCK *dir = jcr->dir_bsock; DEVICE *dev; DCR *dcr; - - if (sscanf(dir->msg, "mount %127s", devname.c_str()) == 1) { - dev = find_device(jcr, devname); - dcr = jcr->dcr; - if (dev) { - P(dev->mutex); /* Use P to avoid indefinite block */ - switch (dev->dev_blocked) { /* device blocked? */ - case BST_WAITING_FOR_SYSOP: - /* Someone is waiting, wake him */ + int drive; + int slot = 0; + bool ok; + + ok = sscanf(dir->msg, "mount %127s drive=%d slot=%d", devname.c_str(), + &drive, &slot) == 3; + if (!ok) { + ok = sscanf(dir->msg, "mount %127s drive=%d", devname.c_str(), &drive) == 2; + } + if (ok) { + dcr = find_device(jcr, devname, drive); + if (dcr) { + dev = dcr->dev; + dev->dlock(); /* Use P to avoid indefinite block */ + Dmsg1(100, "mount cmd blocked=%d\n", dev->blocked()); + switch (dev->blocked()) { /* device blocked? */ + case BST_WAITING_FOR_SYSOP: + /* Someone is waiting, wake him */ Dmsg0(100, "Waiting for mount. Attempting to wake thread\n"); - dev->dev_blocked = BST_MOUNT; - bnet_fsend(dir, "3001 OK mount. Device=\"%s\" (%s)\n", - dev->name(), dev->archive_name()); - pthread_cond_signal(&dev->wait_next_vol); - break; - - /* In both of these two cases, we (the user) unmounted the Volume */ - case BST_UNMOUNTED_WAITING_FOR_SYSOP: - case BST_UNMOUNTED: - /* We freed the device, so reopen it and wake any waiting threads */ - if (open_dev(dev, NULL, OPEN_READ_WRITE) < 0) { - bnet_fsend(dir, _("3901 open device failed: ERR=%s\n"), - strerror_dev(dev)); - break; - } - read_dev_volume_label(dcr); - if (dev->dev_blocked == BST_UNMOUNTED) { - /* We blocked the device, so unblock it */ + dev->set_blocked(BST_MOUNT); + dir->fsend("3001 OK mount. Device=%s\n", + dev->print_name()); + pthread_cond_broadcast(&dev->wait_next_vol); + Dmsg1(100, "JobId=%u broadcast wait_device_release\n", (uint32_t)dcr->jcr->JobId); + pthread_cond_broadcast(&wait_device_release); + break; + + /* In both of these two cases, we (the user) unmounted the Volume */ + case BST_UNMOUNTED_WAITING_FOR_SYSOP: + case BST_UNMOUNTED: + if (dev->is_autochanger() && slot > 0) { + try_autoload_device(jcr, dcr, slot, ""); + } + /* We freed the device, so reopen it and wake any waiting threads */ + if (dev->open(dcr, OPEN_READ_ONLY) < 0) { + dir->fsend(_("3901 open device failed: ERR=%s\n"), + dev->bstrerror()); + if (dev->blocked() == BST_UNMOUNTED) { + /* We blocked the device, so unblock it */ + Dmsg0(100, "Unmounted. Unblocking device\n"); + unblock_device(dev); + } + break; + } + read_dev_volume_label(dcr); + if (dev->blocked() == BST_UNMOUNTED) { + /* We blocked the device, so unblock it */ Dmsg0(100, "Unmounted. Unblocking device\n"); - read_label(dcr); /* this should not be necessary */ - unblock_device(dev); - } else { + read_label(dcr); /* this should not be necessary */ + unblock_device(dev); + } else { Dmsg0(100, "Unmounted waiting for mount. Attempting to wake thread\n"); - dev->dev_blocked = BST_MOUNT; - } - if (dev->is_labeled()) { - bnet_fsend(dir, _("3001 Device \"%s\" (%s) is mounted with Volume \"%s\"\n"), - dev->name(), dev->archive_name(), dev->VolHdr.VolName); - } else { - bnet_fsend(dir, _("3905 Device \"%s\" (%s) open but no Bacula volume is mounted.\n" + dev->set_blocked(BST_MOUNT); + } + if (dev->is_labeled()) { + dir->fsend(_("3001 Device %s is mounted with Volume \"%s\"\n"), + dev->print_name(), dev->VolHdr.VolumeName); + } else { + dir->fsend(_("3905 Device %s open but no Bacula volume is mounted.\n" "If this is not a blank tape, try unmounting and remounting the Volume.\n"), - dev->name(), dev->archive_name()); - } - pthread_cond_signal(&dev->wait_next_vol); - break; - - case BST_DOING_ACQUIRE: - bnet_fsend(dir, _("3001 Device \"%s\" (%s) is mounted; doing acquire.\n"), - dev->name(), dev->archive_name()); - break; - - case BST_WRITING_LABEL: - bnet_fsend(dir, _("3903 Device \"%s\" (%s) is being labeled.\n"), - dev->name(), dev->archive_name()); - break; - - case BST_NOT_BLOCKED: - if (dev->is_open()) { - if (dev->is_labeled()) { - bnet_fsend(dir, _("3001 Device \"%s\" (%s) is mounted with Volume \"%s\"\n"), - dev->name(), dev->archive_name(), dev->VolHdr.VolName); - } else { - bnet_fsend(dir, _("3905 Device \"%s\" (%s) open but no Bacula volume is mounted.\n" + dev->print_name()); + } + pthread_cond_broadcast(&dev->wait_next_vol); + Dmsg1(100, "JobId=%u broadcast wait_device_release\n", (uint32_t)dcr->jcr->JobId); + pthread_cond_broadcast(&wait_device_release); + break; + + case BST_DOING_ACQUIRE: + dir->fsend(_("3001 Device %s is doing acquire.\n"), + dev->print_name()); + break; + + case BST_WRITING_LABEL: + dir->fsend(_("3903 Device %s is being labeled.\n"), + dev->print_name()); + break; + + case BST_NOT_BLOCKED: + if (dev->is_autochanger() && slot > 0) { + try_autoload_device(jcr, dcr, slot, ""); + } + if (dev->is_open()) { + if (dev->is_labeled()) { + dir->fsend(_("3001 Device %s is mounted with Volume \"%s\"\n"), + dev->print_name(), dev->VolHdr.VolumeName); + } else { + dir->fsend(_("3905 Device %s open but no Bacula volume is mounted.\n" "If this is not a blank tape, try unmounting and remounting the Volume.\n"), - dev->name(), dev->archive_name()); - } - } else { - if (!dev_is_tape(dev)) { - bnet_fsend(dir, _("3906 cannot mount non-tape.\n")); - break; - } - if (open_dev(dev, NULL, OPEN_READ_WRITE) < 0) { - bnet_fsend(dir, _("3901 open device failed: ERR=%s\n"), - strerror_dev(dev)); - break; - } - read_label(dcr); - if (dev->is_labeled()) { - bnet_fsend(dir, _("3001 Device \"%s\" (%s) is already mounted with Volume \"%s\"\n"), - dev->name(), dev->archive_name(), dev->VolHdr.VolName); - } else { - bnet_fsend(dir, _("3905 Device \"%s\" (%s) open but no Bacula volume is mounted.\n" + dev->print_name()); + } + } else if (dev->is_tape()) { + if (dev->open(dcr, OPEN_READ_ONLY) < 0) { + dir->fsend(_("3901 open device failed: ERR=%s\n"), + dev->bstrerror()); + break; + } + read_label(dcr); + if (dev->is_labeled()) { + dir->fsend(_("3001 Device %s is already mounted with Volume \"%s\"\n"), + dev->print_name(), dev->VolHdr.VolumeName); + } else { + dir->fsend(_("3905 Device %s open but no Bacula volume is mounted.\n" "If this is not a blank tape, try unmounting and remounting the Volume.\n"), - dev->name(), dev->archive_name()); - } - } - break; - - default: - bnet_fsend(dir, _("3905 Bizarre wait state %d\n"), dev->dev_blocked); - break; - } - V(dev->mutex); + dev->print_name()); + } + } else if (dev->is_unmountable()) { + if (dev->mount(1)) { + dir->fsend(_("3002 Device %s is mounted.\n"), + dev->print_name()); + } else { + dir->fsend(_("3907 %s"), dev->bstrerror()); + } + } else { /* must be file */ + dir->fsend(_("3906 File device %s is always mounted.\n"), + dev->print_name()); + } + break; + + default: + dir->fsend(_("3905 Bizarre wait state %d\n"), dev->blocked()); + break; + } + dev->dunlock(); + free_dcr(dcr); } else { - bnet_fsend(dir, _("3999 Device \"%s\" not found\n"), devname.c_str()); + dir->fsend(_("3999 Device \"%s\" not found or could not be opened.\n"), devname.c_str()); } } else { pm_strcpy(jcr->errmsg, dir->msg); - bnet_fsend(dir, _("3909 Error scanning mount command: %s\n"), jcr->errmsg); + dir->fsend(_("3909 Error scanning mount command: %s\n"), jcr->errmsg); } - bnet_sig(dir, BNET_EOD); + dir->signal(BNET_EOD); return true; } @@ -654,62 +778,86 @@ static bool unmount_cmd(JCR *jcr) POOL_MEM devname; BSOCK *dir = jcr->dir_bsock; DEVICE *dev; - - if (sscanf(dir->msg, "unmount %127s", devname.c_str()) == 1) { - dev = find_device(jcr, devname); - if (dev) { - P(dev->mutex); /* Use P to avoid indefinite block */ - if (!dev->is_open()) { - Dmsg0(90, "Device already unmounted\n"); - bnet_fsend(dir, _("3901 Device \"%s\" (%s) is already unmounted.\n"), - dev->name(), dev->archive_name()); - - } else if (dev->dev_blocked == BST_WAITING_FOR_SYSOP) { + DCR *dcr; + int drive; + + if (sscanf(dir->msg, "unmount %127s drive=%d", devname.c_str(), &drive) == 2) { + dcr = find_device(jcr, devname, drive); + if (dcr) { + dev = dcr->dev; + dev->dlock(); /* Use P to avoid indefinite block */ + if (!dev->is_open()) { + if (!dev->is_busy()) { + unload_autochanger(dcr, -1); + } + if (dev->is_unmountable()) { + if (dev->unmount(0)) { + dir->fsend(_("3002 Device %s unmounted.\n"), + dev->print_name()); + } else { + dir->fsend(_("3907 %s"), dev->bstrerror()); + } + } else { + Dmsg0(90, "Device already unmounted\n"); + dir->fsend(_("3901 Device %s is already unmounted.\n"), + dev->print_name()); + } + } else if (dev->blocked() == BST_WAITING_FOR_SYSOP) { Dmsg2(90, "%d waiter dev_block=%d. doing unmount\n", dev->num_waiting, - dev->dev_blocked); - open_dev(dev, NULL, 0); /* fake open for close */ - offline_or_rewind_dev(dev); - force_close_dev(dev); - dev->dev_blocked = BST_UNMOUNTED_WAITING_FOR_SYSOP; - bnet_fsend(dir, _("3001 Device \"%s\" (%s) unmounted.\n"), - dev->name(), dev->archive_name()); - - } else if (dev->dev_blocked == BST_DOING_ACQUIRE) { - bnet_fsend(dir, _("3902 Device \"%s\" (%s) is busy in acquire.\n"), - dev->name(), dev->archive_name()); - - } else if (dev->dev_blocked == BST_WRITING_LABEL) { - bnet_fsend(dir, _("3903 Device \"%s\" (%s) is being labeled.\n"), - dev->name(), dev->archive_name()); - - } else if (dev->is_busy()) { - send_dir_busy_message(dir, dev); - } else { /* device not being used */ + dev->blocked()); + if (!unload_autochanger(dcr, -1)) { + /* ***FIXME**** what is this ???? */ + dev->close(); + } + if (dev->is_unmountable() && !dev->unmount(0)) { + dir->fsend(_("3907 %s"), dev->bstrerror()); + } else { + dev->set_blocked(BST_UNMOUNTED_WAITING_FOR_SYSOP); + dir->fsend(_("3001 Device %s unmounted.\n"), + dev->print_name()); + } + + } else if (dev->blocked() == BST_DOING_ACQUIRE) { + dir->fsend(_("3902 Device %s is busy in acquire.\n"), + dev->print_name()); + + } else if (dev->blocked() == BST_WRITING_LABEL) { + dir->fsend(_("3903 Device %s is being labeled.\n"), + dev->print_name()); + + } else if (dev->is_busy()) { + send_dir_busy_message(dir, dev); + } else { /* device not being used */ Dmsg0(90, "Device not in use, unmounting\n"); - /* On FreeBSD, I am having ASSERT() failures in block_device() - * and I can only imagine that the thread id that we are - * leaving in no_wait_id is being re-used. So here, - * we simply do it by hand. Gross, but a solution. - */ - /* block_device(dev, BST_UNMOUNTED); replace with 2 lines below */ - dev->dev_blocked = BST_UNMOUNTED; - dev->no_wait_id = 0; - open_dev(dev, NULL, 0); /* fake open for close */ - offline_or_rewind_dev(dev); - force_close_dev(dev); - bnet_fsend(dir, _("3002 Device \"%s\" (%s) unmounted.\n"), - dev->name(), dev->archive_name()); - } - V(dev->mutex); + /* On FreeBSD, I am having ASSERT() failures in block_device() + * and I can only imagine that the thread id that we are + * leaving in no_wait_id is being re-used. So here, + * we simply do it by hand. Gross, but a solution. + */ + /* block_device(dev, BST_UNMOUNTED); replace with 2 lines below */ + dev->set_blocked(BST_UNMOUNTED); + dev->no_wait_id = 0; + if (!unload_autochanger(dcr, -1)) { + dev->close(); + } + if (dev->is_unmountable() && !dev->unmount(0)) { + dir->fsend(_("3907 %s"), dev->bstrerror()); + } else { + dir->fsend(_("3002 Device %s unmounted.\n"), + dev->print_name()); + } + } + dev->dunlock(); + free_dcr(dcr); } else { - bnet_fsend(dir, _("3999 Device \"%s\" not found\n"), devname.c_str()); + dir->fsend(_("3999 Device \"%s\" not found or could not be opened.\n"), devname.c_str()); } } else { /* NB dir->msg gets clobbered in bnet_fsend, so save command */ pm_strcpy(jcr->errmsg, dir->msg); - bnet_fsend(dir, _("3907 Error scanning unmount command: %s\n"), jcr->errmsg); + dir->fsend(_("3907 Error scanning unmount command: %s\n"), jcr->errmsg); } - bnet_sig(dir, BNET_EOD); + dir->signal(BNET_EOD); return true; } @@ -725,95 +873,126 @@ static bool release_cmd(JCR *jcr) POOL_MEM devname; BSOCK *dir = jcr->dir_bsock; DEVICE *dev; - - if (sscanf(dir->msg, "release %127s", devname.c_str()) == 1) { - dev = find_device(jcr, devname); - if (dev) { - P(dev->mutex); /* Use P to avoid indefinite block */ - if (!dev->is_open()) { + DCR *dcr; + int drive; + + if (sscanf(dir->msg, "release %127s drive=%d", devname.c_str(), &drive) == 2) { + dcr = find_device(jcr, devname, drive); + if (dcr) { + dev = dcr->dev; + dev->dlock(); /* Use P to avoid indefinite block */ + if (!dev->is_open()) { + if (!dev->is_busy()) { + unload_autochanger(dcr, -1); + } Dmsg0(90, "Device already released\n"); - bnet_fsend(dir, _("3911 Device \"%s\" (%s) already released.\n"), - dev->name(), dev->archive_name()); + dir->fsend(_("3921 Device %s already released.\n"), + dev->print_name()); - } else if (dev->dev_blocked == BST_WAITING_FOR_SYSOP || - dev->dev_blocked == BST_UNMOUNTED_WAITING_FOR_SYSOP) { - Dmsg2(90, "%d waiter dev_block=%d. doing unmount\n", dev->num_waiting, - dev->dev_blocked); - bnet_fsend(dir, _("3912 Device \"%s\" (%s) waiting for mount.\n"), - dev->name(), dev->archive_name()); - - } else if (dev->dev_blocked == BST_DOING_ACQUIRE) { - bnet_fsend(dir, _("3913 Device \"%s\" (%s) is busy in acquire.\n"), - dev->name(), dev->archive_name()); + } else if (dev->blocked() == BST_WAITING_FOR_SYSOP) { + Dmsg2(90, "%d waiter dev_block=%d.\n", dev->num_waiting, + dev->blocked()); + unload_autochanger(dcr, -1); + dir->fsend(_("3922 Device %s waiting for sysop.\n"), + dev->print_name()); - } else if (dev->dev_blocked == BST_WRITING_LABEL) { - bnet_fsend(dir, _("3914 Device \"%s\" (%s) is being labeled.\n"), - dev->name(), dev->archive_name()); - - } else if (dev->is_busy()) { - send_dir_busy_message(dir, dev); - } else { /* device not being used */ - Dmsg0(90, "Device not in use, unmounting\n"); - release_volume(jcr->dcr); - bnet_fsend(dir, _("3012 Device \"%s\" (%s) released.\n"), - dev->name(), dev->archive_name()); - } - V(dev->mutex); + } else if (dev->blocked() == BST_UNMOUNTED_WAITING_FOR_SYSOP) { + Dmsg2(90, "%d waiter dev_block=%d. doing unmount\n", dev->num_waiting, + dev->blocked()); + dir->fsend(_("3922 Device %s waiting for mount.\n"), + dev->print_name()); + + } else if (dev->blocked() == BST_DOING_ACQUIRE) { + dir->fsend(_("3923 Device %s is busy in acquire.\n"), + dev->print_name()); + + } else if (dev->blocked() == BST_WRITING_LABEL) { + dir->fsend(_("3914 Device %s is being labeled.\n"), + dev->print_name()); + + } else if (dev->is_busy()) { + send_dir_busy_message(dir, dev); + } else { /* device not being used */ + Dmsg0(90, "Device not in use, releaseing\n"); + unload_autochanger(dcr, -1); + release_volume(dcr); + dir->fsend(_("3022 Device %s released.\n"), + dev->print_name()); + } + dev->dunlock(); + free_dcr(dcr); } else { - bnet_fsend(dir, _("3999 Device \"%s\" not found\n"), devname.c_str()); + dir->fsend(_("3999 Device \"%s\" not found or could not be opened.\n"), devname.c_str()); } } else { /* NB dir->msg gets clobbered in bnet_fsend, so save command */ pm_strcpy(jcr->errmsg, dir->msg); - bnet_fsend(dir, _("3917 Error scanning release command: %s\n"), jcr->errmsg); + dir->fsend(_("3927 Error scanning release command: %s\n"), jcr->errmsg); } - bnet_sig(dir, BNET_EOD); + dir->signal(BNET_EOD); return true; } +static bool bootstrap_cmd(JCR *jcr) +{ + return get_bootstrap_file(jcr, jcr->dir_bsock); +} /* * Autochanger command from Director */ -static bool autochanger_cmd(JCR *jcr) +static bool changer_cmd(JCR *jcr) { POOL_MEM devname; BSOCK *dir = jcr->dir_bsock; DEVICE *dev; DCR *dcr; - - if (sscanf(dir->msg, "autochanger list %127s ", devname.c_str()) == 1) { - dev = find_device(jcr, devname); - dcr = jcr->dcr; - if (dev) { - P(dev->mutex); /* Use P to avoid indefinite block */ - if (!dev_is_tape(dev)) { - bnet_fsend(dir, _("3995 Device \"%s\" (%s) is not an autochanger.\n"), - dev->name(), dev->archive_name()); - } else if (!dev->is_open()) { - autochanger_list(dcr, dir); + const char *cmd = NULL; + bool ok = false; + /* + * A safe_cmd may call autochanger script but does not load/unload + * slots so it can be done at the same time that the drive is open. + */ + bool safe_cmd = false; + + if (sscanf(dir->msg, "autochanger list %127s", devname.c_str()) == 1) { + cmd = "list"; + safe_cmd = ok = true; + } else if (sscanf(dir->msg, "autochanger slots %127s", devname.c_str()) == 1) { + cmd = "slots"; + safe_cmd = ok = true; + } else if (sscanf(dir->msg, "autochanger drives %127s", devname.c_str()) == 1) { + cmd = "drives"; + safe_cmd = ok = true; + } + if (ok) { + dcr = find_device(jcr, devname, -1); + if (dcr) { + dev = dcr->dev; + dev->dlock(); /* Use P to avoid indefinite block */ + if (!dev->device->changer_res) { + dir->fsend(_("3995 Device %s is not an autochanger.\n"), + dev->print_name()); /* Under certain "safe" conditions, we can steal the lock */ - } else if (dev->dev_blocked && - (dev->dev_blocked == BST_UNMOUNTED || - dev->dev_blocked == BST_WAITING_FOR_SYSOP || - dev->dev_blocked == BST_UNMOUNTED_WAITING_FOR_SYSOP)) { - autochanger_list(dcr, dir); - } else if (dev->is_busy()) { - send_dir_busy_message(dir, dev); - } else { /* device not being used */ - autochanger_list(dcr, dir); - } - V(dev->mutex); + } else if (safe_cmd || !dev->is_open() || dev->can_steal_lock()) { + autochanger_cmd(dcr, dir, cmd); + } else if (dev->is_busy() || dev->is_blocked()) { + send_dir_busy_message(dir, dev); + } else { /* device not being used */ + autochanger_cmd(dcr, dir, cmd); + } + dev->dunlock(); + free_dcr(dcr); } else { - bnet_fsend(dir, _("3999 Device \"%s\" not found\n"), devname.c_str()); + dir->fsend(_("3999 Device \"%s\" not found or could not be opened.\n"), devname.c_str()); } } else { /* error on scanf */ pm_strcpy(jcr->errmsg, dir->msg); - bnet_fsend(dir, _("3908 Error scanning autocharger list command: %s\n"), - jcr->errmsg); + dir->fsend(_("3908 Error scanning autocharger drives/list/slots command: %s\n"), + jcr->errmsg); } - bnet_sig(dir, BNET_EOD); + dir->signal(BNET_EOD); return true; } @@ -825,66 +1004,68 @@ static bool readlabel_cmd(JCR *jcr) POOL_MEM devname; BSOCK *dir = jcr->dir_bsock; DEVICE *dev; + DCR *dcr; int Slot; - - if (sscanf(dir->msg, "readlabel %127s Slot=%d", devname.c_str(), &Slot) == 2) { - dev = find_device(jcr, devname); - if (dev) { - P(dev->mutex); /* Use P to avoid indefinite block */ - if (!dev->is_open()) { - read_volume_label(jcr, dev, Slot); - force_close_dev(dev); + int drive; + + if (sscanf(dir->msg, "readlabel %127s Slot=%d drive=%d", devname.c_str(), + &Slot, &drive) == 3) { + dcr = find_device(jcr, devname, drive); + if (dcr) { + dev = dcr->dev; + dev->dlock(); /* Use P to avoid indefinite block */ + if (!dev->is_open()) { + read_volume_label(jcr, dcr, dev, Slot); + dev->close(); /* Under certain "safe" conditions, we can steal the lock */ - } else if (dev->dev_blocked && - (dev->dev_blocked == BST_UNMOUNTED || - dev->dev_blocked == BST_WAITING_FOR_SYSOP || - dev->dev_blocked == BST_UNMOUNTED_WAITING_FOR_SYSOP)) { - read_volume_label(jcr, dev, Slot); - } else if (dev->is_busy()) { - send_dir_busy_message(dir, dev); - } else { /* device not being used */ - read_volume_label(jcr, dev, Slot); - } - V(dev->mutex); + } else if (dev->can_steal_lock()) { + read_volume_label(jcr, dcr, dev, Slot); + } else if (dev->is_busy() || dev->is_blocked()) { + send_dir_busy_message(dir, dev); + } else { /* device not being used */ + read_volume_label(jcr, dcr, dev, Slot); + } + dev->dunlock(); + free_dcr(dcr); } else { - bnet_fsend(dir, _("3999 Device \"%s\" not found\n"), devname.c_str()); + dir->fsend(_("3999 Device \"%s\" not found or could not be opened.\n"), devname.c_str()); } } else { pm_strcpy(jcr->errmsg, dir->msg); - bnet_fsend(dir, _("3909 Error scanning readlabel command: %s\n"), jcr->errmsg); + dir->fsend(_("3909 Error scanning readlabel command: %s\n"), jcr->errmsg); } - bnet_sig(dir, BNET_EOD); + dir->signal(BNET_EOD); return true; } + /* * Read the tape label * * Enter with the mutex set */ -static void read_volume_label(JCR *jcr, DEVICE *dev, int Slot) +static void read_volume_label(JCR *jcr, DCR *dcr, DEVICE *dev, int Slot) { BSOCK *dir = jcr->dir_bsock; bsteal_lock_t hold; - DCR *dcr = jcr->dcr; dcr->dev = dev; steal_device_lock(dev, &hold, BST_WRITING_LABEL); - if (!try_autoload_device(jcr, Slot, "")) { - goto bail_out; /* error */ + if (!try_autoload_device(jcr, dcr, Slot, "")) { + goto bail_out; /* error */ } - dev->state &= ~ST_LABEL; /* force read of label */ + dev->clear_labeled(); /* force read of label */ switch (read_dev_volume_label(dcr)) { case VOL_OK: /* DO NOT add quotes around the Volume name. It is scanned in the DIR */ - bnet_fsend(dir, _("3001 Volume=%s Slot=%d\n"), dev->VolHdr.VolName, Slot); - Dmsg1(100, "Volume: %s\n", dev->VolHdr.VolName); + dir->fsend(_("3001 Volume=%s Slot=%d\n"), dev->VolHdr.VolumeName, Slot); + Dmsg1(100, "Volume: %s\n", dev->VolHdr.VolumeName); break; default: - bnet_fsend(dir, _("3902 Cannot mount Volume on Storage Device \"%s\" (%s) because:\n%s"), - dev->name(), dev->archive_name(), jcr->errmsg); + dir->fsend(_("3902 Cannot mount Volume on Storage Device %s because:\n%s"), + dev->print_name(), jcr->errmsg); break; } @@ -893,11 +1074,9 @@ bail_out: return; } -static bool try_autoload_device(JCR *jcr, int slot, const char *VolName) +static bool try_autoload_device(JCR *jcr, DCR *dcr, int slot, const char *VolName) { - DCR *dcr = jcr->dcr; BSOCK *dir = jcr->dir_bsock; - DEVICE *dev = dcr->dev; bstrncpy(dcr->VolumeName, VolName, sizeof(dcr->VolumeName)); dcr->VolCatInfo.Slot = slot; @@ -905,25 +1084,43 @@ static bool try_autoload_device(JCR *jcr, int slot, const char *VolName) if (autoload_device(dcr, 0, dir) < 0) { /* autoload if possible */ return false; } - - /* Ensure that the device is open -- autoload_device() closes it */ - for ( ; !dev->is_open(); ) { - if (open_dev(dev, dcr->VolumeName, OPEN_READ_WRITE) < 0) { - bnet_fsend(dir, _("3910 Unable to open device \"%s\" (%s): ERR=%s\n"), - dev->name(), dev->archive_name(), dev->strerror()); - return false; - } - } return true; } static void send_dir_busy_message(BSOCK *dir, DEVICE *dev) { - if (dev->can_read()) { - bnet_fsend(dir, _("3911 Device \"%s\" (%s) is busy reading.\n"), - dev->name(), dev->archive_name());; + if (dev->is_blocked()) { + switch (dev->blocked()) { + case BST_UNMOUNTED: + dir->fsend(_("3931 Device %s is BLOCKED. user unmounted.\n"), + dev->print_name()); + break; + case BST_UNMOUNTED_WAITING_FOR_SYSOP: + dir->fsend(_("3932 Device %s is BLOCKED. user unmounted during wait for media/mount.\n"), + dev->print_name()); + break; + case BST_WAITING_FOR_SYSOP: + dir->fsend(_("3933 Device %s is BLOCKED waiting for media.\n"), + dev->print_name()); + break; + case BST_DOING_ACQUIRE: + dir->fsend(_("3934 Device %s is being initialized.\n"), + dev->print_name()); + break; + case BST_WRITING_LABEL: + dir->fsend(_("3935 Device %s is blocked labeling a Volume.\n"), + dev->print_name()); + break; + default: + dir->fsend(_("3935 Device %s is blocked for unknown reason.\n"), + dev->print_name()); + break; + } + } else if (dev->can_read()) { + dir->fsend(_("3936 Device %s is busy reading.\n"), + dev->print_name());; } else { - bnet_fsend(dir, _("3912 Device \"%s\" (%s) is busy with %d writer(s).\n"), - dev->name(), dev->archive_name(), dev->num_writers); + dir->fsend(_("3937 Device %s is busy with %d writer(s).\n"), + dev->print_name(), dev->num_writers); } }