+/*
+ 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.
+*/
/*
* Job control and execution for Storage Daemon
*
* Version $Id$
*
*/
-/*
- Copyright (C) 2000-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
- 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"
+static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
+
/* Imported variables */
extern uint32_t VolSessionTime;
/* Imported functions */
extern uint32_t newVolSessionId();
+extern bool do_mac(JCR *jcr);
/* Requests from the Director daemon */
static char jobcmd[] = "JobId=%d job=%127s job_name=%127s client_name=%127s "
/* Responses sent to Director daemon */
static char OKjob[] = "3000 OK Job SDid=%u SDtime=%u Authorization=%s\n";
-static char BAD_job[] = "3915 Bad Job command: %s\n";
+static char BAD_job[] = "3915 Bad Job command. stat=%d CMD: %s\n";
//static char OK_query[] = "3001 OK query\n";
//static char NO_query[] = "3918 Query failed\n";
//static char BAD_query[] = "3917 Bad query command: %s\n";
POOL_MEM job_name, client_name, job, fileset_name, fileset_md5;
int JobType, level, spool_attributes, no_attributes, spool_data;
int write_part_after_job, PreferMountedVols;
-
+ int stat;
JCR *ojcr;
/*
* Get JobId and permissions from Director
*/
Dmsg1(100, "<dird: %s", dir->msg);
- if (sscanf(dir->msg, jobcmd, &JobId, job.c_str(), job_name.c_str(),
+ stat = sscanf(dir->msg, jobcmd, &JobId, job.c_str(), job_name.c_str(),
client_name.c_str(),
&JobType, &level, fileset_name.c_str(), &no_attributes,
&spool_attributes, fileset_md5.c_str(), &spool_data,
- &write_part_after_job, &PreferMountedVols) != 13) {
+ &write_part_after_job, &PreferMountedVols);
+ if (stat != 13) {
pm_strcpy(jcr->errmsg, dir->msg);
- bnet_fsend(dir, BAD_job, jcr->errmsg);
+ bnet_fsend(dir, BAD_job, stat, jcr->errmsg);
Dmsg1(100, ">dird: %s", dir->msg);
- Emsg1(M_FATAL, 0, _("Bad Job Command from Director: %s\n"), jcr->errmsg);
set_jcr_job_status(jcr, JS_ErrorTerminated);
return false;
}
case JT_COPY:
case JT_ARCHIVE:
jcr->authenticated = true;
- run_job(jcr);
+ do_mac(jcr);
return false;
}
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(jcr->mutex);
+ P(mutex);
for ( ;!job_canceled(jcr); ) {
- errstat = pthread_cond_timedwait(&jcr->job_start_wait, &jcr->mutex, &timeout);
+ errstat = pthread_cond_timedwait(&jcr->job_start_wait, &mutex, &timeout);
if (errstat == 0 || errstat == ETIMEDOUT) {
break;
}
}
- V(jcr->mutex);
+ V(mutex);
memset(jcr->sd_auth_key, 0, strlen(jcr->sd_auth_key));
}
jcr->file_bsock = fd;
- jcr->file_bsock->jcr = jcr;
+ jcr->file_bsock->set_jcr(jcr);
Dmsg1(110, "Found Job %s\n", job_name);
Dmsg1(110, "OK Authentication Job %s\n", jcr->Job);
}
- P(jcr->mutex);
if (!jcr->authenticated) {
set_jcr_job_status(jcr, JS_ErrorTerminated);
}
pthread_cond_signal(&jcr->job_start_wait); /* wake waiting job */
- V(jcr->mutex);
free_jcr(jcr);
return;
}
Dmsg1(100, "<dird: %s\n", dir->msg);
if (ok) {
unbash_spaces(dev_name);
-// LockRes();
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 (!device->dev) {
break;
}
-// UnlockRes();
ok = dir_update_device(jcr, device->dev);
if (ok) {
ok = bnet_fsend(dir, OK_query);
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) {
-// UnlockRes();
if (!changer->device || changer->device->size() == 0) {
continue; /* no devices */
}
}
}
/* If we get here, the device/autochanger was not found */
-// UnlockRes();
unbash_spaces(dir->msg);
pm_strcpy(jcr->errmsg, dir->msg);
bnet_fsend(dir, NO_device, dev_name.c_str());
*/
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;
+
if (jcr->dcr) {
free_dcr(jcr->dcr);
jcr->dcr = NULL;
free_dcr(jcr->read_dcr);
jcr->read_dcr = NULL;
}
+
+ 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->write_store) {
+ delete store->device;
+ delete store;
+ }
+ delete jcr->write_store;
+ jcr->write_store = NULL;
+ }
return;
}
projects / bacula / bacula / blobdiff