+/*
+ 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 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.
+*/
/*
* Job control and execution 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"
struct timespec timeout;
int errstat;
+ Dsm_check(1);
Dmsg1(200, "Run_cmd: %s\n", jcr->dir_bsock->msg);
/* The following jobs don't need the FD */
switch (jcr->JobType) {
gettimeofday(&tv, &tz);
timeout.tv_nsec = tv.tv_usec * 1000;
- timeout.tv_sec = tv.tv_sec + 30 * 60; /* wait 30 minutes */
+ timeout.tv_sec = tv.tv_sec + me->client_wait;
- Dmsg1(100, "%s waiting on FD to contact SD\n", jcr->Job);
+ Dmsg2(100, "%s waiting %d sec for FD to contact SD\n",
+ jcr->Job, (int)me->client_wait);
/*
* Wait for the File daemon to contact us to start the Job,
* when he does, we will be released, unless the 30 minutes
* expires.
*/
P(mutex);
- for ( ;!job_canceled(jcr); ) {
+ for ( ; !job_canceled(jcr); ) {
errstat = pthread_cond_timedwait(&jcr->job_start_wait, &mutex, &timeout);
if (errstat == 0 || errstat == ETIMEDOUT) {
break;
}
jcr->file_bsock = fd;
- jcr->file_bsock->jcr = jcr;
+ jcr->file_bsock->set_jcr(jcr);
Dmsg1(110, "Found Job %s\n", job_name);
unbash_spaces(dev_name);
foreach_res(device, R_DEVICE) {
/* Find resource, and make sure we were able to open it */
- if (fnmatch(dev_name.c_str(), device->hdr.name, 0) == 0) {
+ if (strcmp(dev_name.c_str(), device->hdr.name) == 0) {
if (!device->dev) {
device->dev = init_dev(jcr, device);
}
}
foreach_res(changer, R_AUTOCHANGER) {
/* Find resource, and make sure we were able to open it */
- if (fnmatch(dev_name.c_str(), changer->hdr.name, 0) == 0) {
+ if (strcmp(dev_name.c_str(), changer->hdr.name) == 0) {
if (!changer->device || changer->device->size() == 0) {
continue; /* no devices */
}
*/
void stored_free_jcr(JCR *jcr)
{
+ Dmsg1(900, "stored_free_jcr JobId=%u\n", jcr->JobId);
if (jcr->file_bsock) {
bnet_close(jcr->file_bsock);
jcr->file_bsock = NULL;
delete jcr->dcrs;
}
jcr->dcrs = NULL;
+
+ /* Avoid a double free */
+ if (jcr->dcr == jcr->read_dcr) {
+ jcr->read_dcr = NULL;
+ }
if (jcr->dcr) {
free_dcr(jcr->dcr);
jcr->dcr = NULL;
free_dcr(jcr->read_dcr);
jcr->read_dcr = NULL;
}
- if (jcr->dirstore) {
+
+ if (jcr->read_store) {
+ DIRSTORE *store;
+ foreach_alist(store, jcr->read_store) {
+ delete store->device;
+ delete store;
+ }
+ delete jcr->read_store;
+ jcr->read_store = NULL;
+ }
+ if (jcr->write_store) {
DIRSTORE *store;
- foreach_alist(store, jcr->dirstore) {
+ foreach_alist(store, jcr->write_store) {
delete store->device;
delete store;
}
- delete jcr->dirstore;
- jcr->dirstore = NULL;
+ delete jcr->write_store;
+ jcr->write_store = NULL;
}
+ Dsm_check(1);
return;
}