+/*
+ Bacula® - The Network Backup Solution
+
+ Copyright (C) 2000-2007 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 plus additions
+ that are listed 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.
+*/
/*
* Drive reservation functions for Storage Daemon
*
* Version $Id$
*
*/
-/*
- 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
- 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
- the file LICENSE for additional details.
-
- */
#include "bacula.h"
#include "stored.h"
if (vol->dcr == dcr && (vol->dev == NULL ||
strcmp(vol->vol_name, vol->dev->VolHdr.VolumeName) != 0)) {
vol_list->remove(vol);
- Dmsg1(100, "free_unused_olume %s\n", vol->vol_name);
+ Dmsg1(100, "free_unused_volume %s\n", vol->vol_name);
free(vol->vol_name);
free(vol);
break;
/*
* List Volumes -- this should be moved to status.c
*/
-void list_volumes(BSOCK *user)
+void list_volumes(void sendit(const char *msg, int len, void *sarg), void *arg)
{
VOLRES *vol;
+ char *msg;
+ int len;
+
+ msg = (char *)get_pool_memory(PM_MESSAGE);
+
P(vol_list_lock);
for (vol=(VOLRES *)vol_list->first(); vol; vol=(VOLRES *)vol_list->next(vol)) {
if (vol->dev) {
- bnet_fsend(user, "%s on device %s\n", vol->vol_name, vol->dev->print_name());
+ len = Mmsg(msg, "%s on device %s\n", vol->vol_name, vol->dev->print_name());
+ sendit(msg, len, arg);
} else {
- bnet_fsend(user, "%s\n", vol->vol_name);
+ len = Mmsg(msg, "%s\n", vol->vol_name);
+ sendit(msg, len, arg);
}
}
V(vol_list_lock);
+
+ free_pool_memory(msg);
}
/* Create the Volume list */
}
P(vol_list_lock);
for (vol=(VOLRES *)vol_list->first(); vol; vol=(VOLRES *)vol_list->next(vol)) {
- Dmsg3(000, "Unreleased Volume=%s dcr=0x%x dev=0x%x\n", vol->vol_name,
+ Dmsg3(100, "Unreleased Volume=%s dcr=0x%x dev=0x%x\n", vol->vol_name,
vol->dcr, vol->dev);
}
delete vol_list;
RCTX rctx;
char *msg;
alist *msgs;
+ alist *dirstore;
memset(&rctx, 0, sizeof(RCTX));
rctx.jcr = jcr;
* If there are multiple devices, the director sends us
* use_device for each device that it wants to use.
*/
- jcr->dirstore = New(alist(10, not_owned_by_alist));
+ dirstore = New(alist(10, not_owned_by_alist));
+// Dmsg2(000, "dirstore=%p JobId=%u\n", dirstore, jcr->JobId);
msgs = jcr->reserve_msgs = New(alist(10, not_owned_by_alist));
do {
Dmsg1(100, "<dird: %s", dir->msg);
if (!ok) {
break;
}
+ if (append) {
+ jcr->write_store = dirstore;
+ } else {
+ jcr->read_store = dirstore;
+ }
+ rctx.append = append;
unbash_spaces(store_name);
unbash_spaces(media_type);
unbash_spaces(pool_name);
unbash_spaces(pool_type);
store = new DIRSTORE;
- jcr->dirstore->append(store);
+ dirstore->append(store);
memset(store, 0, sizeof(DIRSTORE));
store->device = New(alist(10));
bstrncpy(store->name, store_name, sizeof(store->name));
store->append = append;
/* Now get all devices */
- while (bnet_recv(dir) >= 0) {
+ while (dir->recv() >= 0) {
Dmsg1(100, "<dird device: %s", dir->msg);
ok = sscanf(dir->msg, use_device, dev_name.c_str()) == 1;
if (!ok) {
unbash_spaces(dev_name);
store->device->append(bstrdup(dev_name.c_str()));
}
- } while (ok && bnet_recv(dir) >= 0);
+ } while (ok && dir->recv() >= 0);
#ifdef DEVELOPER
/* This loop is debug code and can be removed */
/* ***FIXME**** remove after 1.38 release */
char *device_name;
- foreach_alist(store, jcr->dirstore) {
+ foreach_alist(store, dirstore) {
Dmsg5(110, "Storage=%s media_type=%s pool=%s pool_type=%s append=%d\n",
store->name, store->media_type, store->pool_name,
store->pool_type, store->append);
*/
if (ok) {
bool first = true; /* print wait message once */
+ bool fail = false;
rctx.notify_dir = true;
- for ( ; !job_canceled(jcr); ) {
- lock_reservations(); /* only one thread at a time */
+ lock_reservations();
+ for ( ; !fail && !job_canceled(jcr); ) {
while ((msg = (char *)msgs->pop())) {
free(msg);
}
if ((ok = find_suitable_device_for_job(jcr, rctx))) {
break;
}
- /* Unlock before possible wait */
+ /* Keep reservations locked *except* during wait_for_device() */
unlock_reservations();
if (!rctx.suitable_device || !wait_for_device(jcr, first)) {
Dmsg0(100, "Fail. !suitable_device || !wait_for_device\n");
- break; /* Get out, failure ... */
+ fail = true;
}
+ lock_reservations();
first = false;
bnet_sig(dir, BNET_HEARTBEAT); /* Inform Dir that we are alive */
}
- /* Note if !ok then search_lock is already cleared */
- if (ok) {
- unlock_reservations();
- goto all_done;
- }
-
- /*
- * If we get here, there are no suitable devices available, which
- * means nothing configured. If a device is suitable but busy
- * with another Volume, we will not come here.
- */
- if (verbose) {
+ unlock_reservations();
+ if (!ok) {
+ /*
+ * If we get here, there are no suitable devices available, which
+ * means nothing configured. If a device is suitable but busy
+ * with another Volume, we will not come here.
+ */
unbash_spaces(dir->msg);
pm_strcpy(jcr->errmsg, dir->msg);
Jmsg(jcr, M_INFO, 0, _("Failed command: %s\n"), jcr->errmsg);
- }
- Jmsg(jcr, M_FATAL, 0, _("\n"
- " Device \"%s\" with MediaType \"%s\" requested by DIR not found in SD Device resources.\n"),
- dev_name.c_str(), media_type.c_str());
- bnet_fsend(dir, NO_device, dev_name.c_str());
+ Jmsg(jcr, M_FATAL, 0, _("\n"
+ " Device \"%s\" with MediaType \"%s\" requested by DIR not found in SD Device resources.\n"),
+ dev_name.c_str(), media_type.c_str());
+ bnet_fsend(dir, NO_device, dev_name.c_str());
- Dmsg1(100, ">dird: %s", dir->msg);
+ Dmsg1(100, ">dird: %s", dir->msg);
+ }
} else {
unbash_spaces(dir->msg);
pm_strcpy(jcr->errmsg, dir->msg);
- if (verbose) {
- Jmsg(jcr, M_INFO, 0, _("Failed command: %s\n"), jcr->errmsg);
- }
+ Jmsg(jcr, M_FATAL, 0, _("Failed command: %s\n"), jcr->errmsg);
bnet_fsend(dir, BAD_use, jcr->errmsg);
Dmsg1(100, ">dird: %s", dir->msg);
}
-all_done:
release_msgs(jcr);
return ok;
}
bool ok;
DIRSTORE *store;
char *device_name;
+ alist *dirstore;
+ if (rctx.append) {
+ dirstore = jcr->write_store;
+ } else {
+ dirstore = jcr->read_store;
+ }
/*
* For each storage device that the user specified, we
* search and see if there is a resource for that device.
rctx.PreferMountedVols, rctx.exact_match, rctx.suitable_device,
rctx.autochanger_only);
ok = false;
- foreach_alist(store, jcr->dirstore) {
+ foreach_alist(store, dirstore) {
rctx.store = store;
foreach_alist(device_name, store->device) {
int stat;
break;
}
}
-
return ok;
}
ASSERT(dcr);
- P(dev->mutex);
+ /* Get locks in correct order */
+ unlock_reservations();
+ dev->lock();
+ lock_reservations();
if (is_device_unmounted(dev)) {
Dmsg1(200, "Device %s is BLOCKED due to user unmount.\n", dev->print_name());
dcr->reserved_device = true;
bail_out:
- V(dev->mutex);
+ dev->unlock();
return ok;
}
ASSERT(dcr);
- P(dev->mutex);
+ /* Get locks in correct order */
+ unlock_reservations();
+ dev->lock();
+ lock_reservations();
/* If device is being read, we cannot write it */
if (dev->can_read()) {
ok = true;
bail_out:
- V(dev->mutex);
+ dev->unlock();
return ok;
}
/* Check for prefer mounted volumes */
if (rctx.PreferMountedVols && !dev->VolHdr.VolumeName[0] && dev->is_tape()) {
- Mmsg(jcr->errmsg, _("3606 JobId=%u wants mounted, but drive %s has no Volume.\n"),
+ Mmsg(jcr->errmsg, _("3606 JobId=%u prefers mounted drives, but drive %s has no Volume.\n"),
jcr->JobId, dev->print_name());
queue_reserve_message(jcr);
Dmsg1(110, "failed: want mounted -- no vol JobId=%u\n", jcr->JobId);
return 1;
} else {
/* Drive Pool not suitable for us */
- Mmsg(jcr->errmsg, _("3609 JobId=%u wants Pool=\"%s\" but have Pool=\"%s\" on drive %s.\n"),
+ Mmsg(jcr->errmsg, _("3609 JobId=%u wants Pool=\"%s\" but has Pool=\"%s\" on drive %s.\n"),
jcr->JobId, dcr->pool_name, dev->pool_name, dev->print_name());
queue_reserve_message(jcr);
Dmsg2(110, "failed: busy num_writers>0, can_append, pool=%s wanted=%s\n",
/*
* Send any reservation messages queued for this jcr
*/
-void send_drive_reserve_messages(JCR *jcr, BSOCK *user)
+void send_drive_reserve_messages(JCR *jcr, void sendit(const char *msg, int len, void *sarg), void *arg)
{
int i;
alist *msgs;
for (i=msgs->size()-1; i >= 0; i--) {
msg = (char *)msgs->get(i);
if (msg) {
- bnet_fsend(user, " %s", msg);
+ sendit(" ", 3, arg);
+ sendit(msg, strlen(msg), arg);
} else {
break;
}
projects / bacula / bacula / blobdiff