/*
Bacula® - The Network Backup Solution
- Copyright (C) 2002-2008 Free Software Foundation Europe e.V.
+ Copyright (C) 2002-2010 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
+ modify it under the terms of version three of the GNU Affero General Public
License as published by the Free Software Foundation and included
in the file LICENSE.
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
+ You should have received a copy of the GNU Affero 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.
+ Bacula® is a registered trademark of Kern Sibbald.
The licensor of Bacula is the Free Software Foundation Europe
(FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
Switzerland, email:ftf@fsfeurope.org.
*
* Kern Sibbald, August MMII
*
- * Version $Id$
*/
#include "bacula.h" /* pull in global headers */
slot = dcr->VolCatInfo.InChanger ? dcr->VolCatInfo.Slot : 0;
Dmsg3(100, "autoload: slot=%d InChgr=%d Vol=%s\n", dcr->VolCatInfo.Slot,
- dcr->VolCatInfo.InChanger, dcr->VolCatInfo.VolCatName);
+ dcr->VolCatInfo.InChanger, dcr->getVolCatName());
/*
* Handle autoloaders here. If we cannot autoload it, we
* will return 0 so that the sysop will be asked to load it.
changer = get_pool_memory(PM_FNAME);
if (slot <= 0) {
Jmsg(jcr, M_INFO, 0, _("Invalid slot=%d defined in catalog for Volume \"%s\" "
- "on %s. Manual load may be required.\n"), slot, dcr->VolCatInfo.VolCatName,
+ "on %s. Manual load may be required.\n"), slot, dcr->getVolCatName(),
dev->print_name());
rtn_stat = 0;
} else if (!dcr->device->changer_name) {
if (dev->get_slot() > 0) {
return dev->get_slot();
}
+
/* Virtual disk autochanger */
if (dcr->device->changer_command[0] == 0) {
return 1;
free_volume(dev); /* Free any volume associated with this drive */
free_pool_memory(changer);
}
- dev->clear_unload();
+ if (ok) {
+ dev->clear_unload();
+ }
return ok;
}
break;
}
if (dev->is_busy()) {
- Jmsg(dcr->jcr, M_WARNING, 0, _("Volume \"%s\" is in use by device %s\n"),
- dcr->VolumeName, dev->print_name());
+ Jmsg(dcr->jcr, M_WARNING, 0, _("Volume \"%s\" wanted on %s is in use by device %s\n"),
+ dcr->VolumeName, dcr->dev->print_name(), dev->print_name());
Dmsg4(100, "Vol %s for dev=%s is busy dev=%s slot=%d\n",
dcr->VolumeName, dcr->dev->print_name(), dev->print_name(), dev->get_slot());
Dmsg2(100, "num_writ=%d reserv=%d\n", dev->num_writers, dev->num_reserved());
+ volume_unused(dcr);
return false;
}
return unload_dev(dcr, dev);
}
+/*
+ * Unconditionally unload a specified drive
+ */
bool unload_dev(DCR *dcr, DEVICE *dev)
{
JCR *jcr = dcr->jcr;
DEVICE *save_dev;
int save_slot;
- if (!changer || dev->get_slot() <= 0) {
+ if (!changer) {
return false;
}
- dev->dlock();
+
+ save_dev = dcr->dev; /* save dcr device */
+ dcr->dev = dev; /* temporarily point dcr at other device */
+
+ if (dev->get_slot() <= 0 && get_autochanger_loaded_slot(dcr) <= 0) {
+ dcr->dev = save_dev;
+ return false;
+ }
+ save_slot = dcr->VolCatInfo.Slot;
+ dcr->VolCatInfo.Slot = dev->get_slot();
+
+// dev->dlock();
POOLMEM *changer_cmd = get_pool_memory(PM_FNAME);
POOL_MEM results(PM_MESSAGE);
Dmsg2(100, "Issuing autochanger \"unload slot %d, drive %d\" command.\n",
dev->get_slot(), dev->drive_index);
- save_dev = dcr->dev;
- dcr->dev = dev;
- save_slot = dcr->VolCatInfo.Slot;
- dcr->VolCatInfo.Slot = dev->get_slot();
changer_cmd = edit_device_codes(dcr, changer_cmd,
dcr->device->changer_command, "unload");
dev->close();
Dmsg2(100, "Slot %d unloaded %s\n", dev->get_slot(), dev->print_name());
dev->set_slot(0); /* nothing loaded */
}
- dev->clear_unload();
+ if (ok) {
+ dev->clear_unload();
+ }
unlock_changer(dcr);
- dev->dunlock();
+// dev->dunlock();
free_volume(dev); /* Free any volume associated with this drive */
free_pool_memory(changer_cmd);
dir->fsend(_("3996 Open bpipe failed.\n"));
goto bail_out;
}
- if (strcmp(cmd, "list") == 0) {
+ if (bstrcmp(cmd, "list") || bstrcmp(cmd, "listall")) {
/* Get output from changer */
while (fgets(dir->msg, len, bpipe->rfd)) {
dir->msglen = strlen(dir->msg);
str = dcr->jcr->Job;
break;
case 'v':
- str = NPRT(dcr->VolumeName);
+ if (dcr->VolCatInfo.VolCatName[0]) {
+ str = dcr->VolCatInfo.VolCatName;
+ } else if (dcr->VolumeName[0]) {
+ str = dcr->VolumeName;
+ } else if (dcr->dev->vol && dcr->dev->vol->vol_name) {
+ str = dcr->dev->vol->vol_name;
+ } else {
+ str = dcr->dev->VolHdr.VolumeName;
+ }
break;
case 'f':
str = NPRT(dcr->jcr->client_name);