/*
- * Job control and execution for Storage Daemon
- *
- * Kern Sibbald, MM
- *
- * Version $Id$
- *
- */
-/*
- Copyright (C) 2000-2005 Kern Sibbald
+ Bacula® - The Network Backup Solution
+
+ Copyright (C) 2000-2011 Free Software Foundation Europe e.V.
- 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.
+ 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 three of the GNU Affero 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
+ 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.
+ 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 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.
+*/
+/*
+ * Job control and execution for Storage Daemon
+ *
+ * Kern Sibbald, MM
+ *
*/
#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();
-
-/* Forward referenced functions */
-static bool use_storage_cmd(JCR *jcr);
+extern bool do_mac(JCR *jcr);
/* Requests from the Director daemon */
+/* Added in 3.1.4 14Sep09 KES */
static char jobcmd[] = "JobId=%d job=%127s job_name=%127s client_name=%127s "
"type=%d level=%d FileSet=%127s NoAttr=%d SpoolAttr=%d FileSetMD5=%127s "
- "SpoolData=%d WritePartAfterJob=%d NewVol=%d\n";
-static char use_storage[] = "use storage=%127s media_type=%127s "
- "pool_name=%127s pool_type=%127s append=%d copy=%d stripe=%d\n";
-static char use_device[] = "use device=%127s\n";
-//static char query_device[] = "query device=%127s";
-
+ "SpoolData=%d WritePartAfterJob=%d PreferMountedVols=%d SpoolSize=%s "
+ "rerunning=%d VolSessionId=%d VolSessionTime=%d\n";
/* Responses sent to Director daemon */
static char OKjob[] = "3000 OK Job SDid=%u SDtime=%u Authorization=%s\n";
-static char OK_device[] = "3000 OK use device device=%s\n";
-static char NO_device[] = "3924 Device \"%s\" not in SD Device resources.\n";
-static char NOT_open[] = "3925 Device \"%s\" could not be opened or does not exist.\n";
-static char BAD_use[] = "3913 Bad use command: %s\n";
-static char BAD_job[] = "3915 Bad Job command: %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";
+static char BAD_job[] = "3915 Bad Job command. stat=%d CMD: %s\n";
/*
* Director requests us to start a job
*/
bool job_cmd(JCR *jcr)
{
- int JobId;
+ int32_t JobId;
char auth_key[100];
+ char spool_size[30];
+ char seed[100];
BSOCK *dir = jcr->dir_bsock;
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, NewVol;
-
+ int32_t JobType, level, spool_attributes, no_attributes, spool_data;
+ int32_t write_part_after_job, PreferMountedVols;
+ int stat;
JCR *ojcr;
/*
* Get JobId and permissions from Director
*/
- Dmsg1(100, "<dird: %s\n", dir->msg);
- if (sscanf(dir->msg, jobcmd, &JobId, job.c_str(), job_name.c_str(),
+ Dmsg1(100, "<dird: %s", dir->msg);
+ bstrncpy(spool_size, "0", sizeof(spool_size));
+ 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, &NewVol) != 13) {
+ &spool_attributes, fileset_md5.c_str(), &spool_data,
+ &write_part_after_job, &PreferMountedVols, spool_size,
+ &jcr->rerunning, &jcr->VolSessionId, &jcr->VolSessionTime);
+ if (stat != 17) {
pm_strcpy(jcr->errmsg, dir->msg);
- bnet_fsend(dir, BAD_job, jcr->errmsg);
- Dmsg1(100, ">dird: %s\n", dir->msg);
- Emsg1(M_FATAL, 0, _("Bad Job Command from Director: %s\n"), jcr->errmsg);
- set_jcr_job_status(jcr, JS_ErrorTerminated);
+ dir->fsend(BAD_job, stat, jcr->errmsg);
+ Dmsg1(100, ">dird: %s", dir->msg);
+ jcr->setJobStatus(JS_ErrorTerminated);
return false;
}
+ Dmsg3(100, "==== rerunning=%d VolSesId=%d VolSesTime=%d\n", jcr->rerunning,
+ jcr->VolSessionId, jcr->VolSessionTime);
/*
* Since this job could be rescheduled, we
* check to see if we have it already. If so
*/
ojcr = get_jcr_by_full_name(job.c_str());
if (ojcr && !ojcr->authenticated) {
- Dmsg2(100, "Found ojcr=0x%x Job %s\n", (unsigned)(long)ojcr, job.c_str());
+ Dmsg2(100, "Found ojcr=0x%x Job %s\n", (unsigned)(intptr_t)ojcr, job.c_str());
free_jcr(ojcr);
}
jcr->JobId = JobId;
- jcr->VolSessionId = newVolSessionId();
- jcr->VolSessionTime = VolSessionTime;
+ Dmsg2(800, "Start JobId=%d %p\n", JobId, jcr);
+ /*
+ * If job rescheduled because previous was incomplete,
+ * the Resched flag is set and VolSessionId and VolSessionTime
+ * are given to us (same as restarted job).
+ */
+ if (!jcr->rerunning) {
+ jcr->VolSessionId = newVolSessionId();
+ jcr->VolSessionTime = VolSessionTime;
+ }
bstrncpy(jcr->Job, job, sizeof(jcr->Job));
unbash_spaces(job_name);
jcr->job_name = get_pool_memory(PM_NAME);
unbash_spaces(fileset_name);
jcr->fileset_name = get_pool_memory(PM_NAME);
pm_strcpy(jcr->fileset_name, fileset_name);
- jcr->JobType = JobType;
- jcr->JobLevel = level;
+ jcr->setJobType(JobType);
+ jcr->setJobLevel(level);
jcr->no_attributes = no_attributes;
jcr->spool_attributes = spool_attributes;
jcr->spool_data = spool_data;
+ jcr->spool_size = str_to_int64(spool_size);
jcr->write_part_after_job = write_part_after_job;
jcr->fileset_md5 = get_pool_memory(PM_NAME);
pm_strcpy(jcr->fileset_md5, fileset_md5);
- jcr->NewVolEachJob = NewVol;
+ jcr->PreferMountedVols = PreferMountedVols;
+
jcr->authenticated = false;
/*
* Pass back an authorization key for the File daemon
*/
- make_session_key(auth_key, NULL, 1);
- bnet_fsend(dir, OKjob, jcr->VolSessionId, jcr->VolSessionTime, auth_key);
- Dmsg1(100, ">dird: %s", dir->msg);
+ bsnprintf(seed, sizeof(seed), "%p%d", jcr, JobId);
+ make_session_key(auth_key, seed, 1);
+ dir->fsend(OKjob, jcr->VolSessionId, jcr->VolSessionTime, auth_key);
+ Dmsg2(50, ">dird jid=%u: %s", (uint32_t)jcr->JobId, dir->msg);
jcr->sd_auth_key = bstrdup(auth_key);
memset(auth_key, 0, sizeof(auth_key));
+ new_plugins(jcr); /* instantiate the plugins */
generate_daemon_event(jcr, "JobStart");
- return true;
-}
-
-bool use_cmd(JCR *jcr)
-{
- /*
- * Wait for the device, media, and pool information
- */
- if (!use_storage_cmd(jcr)) {
- set_jcr_job_status(jcr, JS_ErrorTerminated);
- memset(jcr->sd_auth_key, 0, strlen(jcr->sd_auth_key));
- return false;
- }
+ generate_plugin_event(jcr, bsdEventJobStart, (void *)"JobStart");
return true;
}
struct timeval tv;
struct timezone tz;
struct timespec timeout;
- int errstat;
-
- Dmsg1(100, "Run_cmd: %s\n", jcr->dir_bsock->msg);
- /* The following jobs don't need the FD */
- switch (jcr->JobType) {
- case JT_MIGRATION:
- case JT_COPY:
- case JT_ARCHIVE:
- jcr->authenticated = true;
- run_job(jcr);
+ int errstat = 0;
+
+ Dsm_check(200);
+ Dmsg1(200, "Run_cmd: %s\n", jcr->dir_bsock->msg);
+
+ /* If we do not need the FD, we are doing a migrate, copy, or virtual
+ * backup.
+ */
+ if (jcr->no_client_used()) {
+ do_mac(jcr);
return false;
}
- set_jcr_job_status(jcr, JS_WaitFD); /* wait for FD to connect */
- dir_send_job_status(jcr);
+ jcr->sendJobStatus(JS_WaitFD); /* wait for FD to connect */
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;
+
+ Dmsg3(50, "%s waiting %d sec for FD to contact SD key=%s\n",
+ jcr->Job, (int)(timeout.tv_sec-time(NULL)), jcr->sd_auth_key);
+ Dmsg2(800, "Wait FD for jid=%d %p\n", jcr->JobId, jcr);
- Dmsg1(100, "%s waiting on FD to contact SD\n", jcr->Job);
/*
* 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);
- for ( ;!job_canceled(jcr); ) {
- errstat = pthread_cond_timedwait(&jcr->job_start_wait, &jcr->mutex, &timeout);
- if (errstat == 0 || errstat == ETIMEDOUT) {
+ P(mutex);
+ while ( !jcr->authenticated && !job_canceled(jcr) ) {
+ errstat = pthread_cond_timedwait(&jcr->job_start_wait, &mutex, &timeout);
+ if (errstat == ETIMEDOUT || errstat == EINVAL || errstat == EPERM) {
break;
}
+ Dmsg1(800, "=== Auth cond errstat=%d\n", errstat);
}
- V(jcr->mutex);
+ Dmsg3(50, "Auth=%d canceled=%d errstat=%d\n", jcr->authenticated,
+ job_canceled(jcr), errstat);
+ V(mutex);
+ Dmsg2(800, "Auth fail or cancel for jid=%d %p\n", jcr->JobId, jcr);
memset(jcr->sd_auth_key, 0, strlen(jcr->sd_auth_key));
if (jcr->authenticated && !job_canceled(jcr)) {
- Dmsg1(100, "Running job %s\n", jcr->Job);
+ Dmsg2(800, "Running jid=%d %p\n", jcr->JobId, jcr);
run_job(jcr); /* Run the job */
}
+ Dmsg2(800, "Done jid=%d %p\n", jcr->JobId, jcr);
return false;
}
/*
- * After receiving a connection (in job.c) if it is
+ * After receiving a connection (in dircmd.c) if it is
* from the File daemon, this routine is called.
*/
void handle_filed_connection(BSOCK *fd, char *job_name)
{
JCR *jcr;
- bmicrosleep(0, 50000); /* wait 50 millisecs */
+/*
+ * With the following bmicrosleep on, running the
+ * SD under the debugger fails.
+ */
+// bmicrosleep(0, 50000); /* wait 50 millisecs */
if (!(jcr=get_jcr_by_full_name(job_name))) {
- Jmsg1(NULL, M_FATAL, 0, _("Job name not found: %s\n"), job_name);
- Dmsg1(100, "Job name not found: %s\n", job_name);
+ Jmsg1(NULL, M_FATAL, 0, _("FD connect failed: Job name not found: %s\n"), job_name);
+ Dmsg1(3, "**** Job \"%s\" not found.\n", job_name);
+ fd->close();
return;
}
- jcr->file_bsock = fd;
- jcr->file_bsock->jcr = jcr;
- Dmsg1(110, "Found Job %s\n", job_name);
+ Dmsg1(50, "Found Job %s\n", job_name);
if (jcr->authenticated) {
- Jmsg2(jcr, M_FATAL, 0, "Hey!!!! JobId %u Job %s already authenticated.\n",
- jcr->JobId, jcr->Job);
+ Jmsg2(jcr, M_FATAL, 0, _("Hey!!!! JobId %u Job %s already authenticated.\n"),
+ (uint32_t)jcr->JobId, jcr->Job);
+ Dmsg2(50, "Hey!!!! JobId %u Job %s already authenticated.\n",
+ (uint32_t)jcr->JobId, jcr->Job);
+ fd->close();
free_jcr(jcr);
return;
}
+ jcr->file_bsock = fd;
+ jcr->file_bsock->set_jcr(jcr);
+
/*
* Authenticate the File daemon
*/
if (jcr->authenticated || !authenticate_filed(jcr)) {
- Dmsg1(100, "Authentication failed Job %s\n", jcr->Job);
+ Dmsg1(50, "Authentication failed Job %s\n", jcr->Job);
Jmsg(jcr, M_FATAL, 0, _("Unable to authenticate File daemon\n"));
} else {
jcr->authenticated = true;
- Dmsg1(110, "OK Authentication Job %s\n", jcr->Job);
+ Dmsg2(50, "OK Authentication jid=%u Job %s\n", (uint32_t)jcr->JobId, jcr->Job);
}
- P(jcr->mutex);
if (!jcr->authenticated) {
- set_jcr_job_status(jcr, JS_ErrorTerminated);
+ jcr->setJobStatus(JS_ErrorTerminated);
}
pthread_cond_signal(&jcr->job_start_wait); /* wake waiting job */
- V(jcr->mutex);
free_jcr(jcr);
return;
}
-/*
- * Use Device command from Director
- * He tells is what Device Name to use, the Media Type,
- * the Pool Name, and the Pool Type.
- *
- * Ensure that the device exists and is opened, then store
- * the media and pool info in the JCR.
- */
-class DIRSTORE {
-public:
- alist *device;
- char name[MAX_NAME_LENGTH];
- char media_type[MAX_NAME_LENGTH];
- char pool_name[MAX_NAME_LENGTH];
- char pool_type[MAX_NAME_LENGTH];
-};
-
-static int search_res_for_device(JCR *jcr, DIRSTORE *store, char *device_name, int append);
-
-static bool use_storage_cmd(JCR *jcr)
-{
- POOL_MEM store_name, dev_name, media_type, pool_name, pool_type;
- BSOCK *dir = jcr->dir_bsock;
- int append;
- bool ok;
- int Copy, Stripe;
- alist *dirstore;
- DIRSTORE *store;
- char *device_name;
- DCR *dcr = NULL;
- /*
- * If there are multiple devices, the director sends us
- * use_device for each device that it wants to use.
- */
- Dmsg1(100, "<dird: %s", dir->msg);
- dirstore = New(alist(10, not_owned_by_alist));
- do {
- ok = sscanf(dir->msg, use_storage, store_name.c_str(),
- media_type.c_str(), pool_name.c_str(),
- pool_type.c_str(), &append, &Copy, &Stripe) == 7;
- if (!ok) {
- break;
- }
- unbash_spaces(store_name);
- unbash_spaces(media_type);
- unbash_spaces(pool_name);
- unbash_spaces(pool_type);
- store = new DIRSTORE;
- dirstore->append(store);
- memset(store, 0, sizeof(DIRSTORE));
- store->device = New(alist(10));
- bstrncpy(store->name, store_name, sizeof(store->name));
- bstrncpy(store->media_type, media_type, sizeof(store->media_type));
- bstrncpy(store->pool_name, pool_name, sizeof(store->pool_name));
- bstrncpy(store->pool_type, pool_type, sizeof(store->pool_type));
-
- /* Now get all devices */
- while (bnet_recv(dir) >= 0) {
- ok = sscanf(dir->msg, use_device, dev_name.c_str()) == 1;
- if (!ok) {
- break;
- }
- unbash_spaces(dev_name);
- store->device->append(bstrdup(dev_name.c_str()));
- }
- } while (ok && bnet_recv(dir) >= 0);
-
-#ifdef DEVELOPER
- /* This loop is debug code and can be removed */
- /* ***FIXME**** remove after 1.38 release */
- foreach_alist(store, dirstore) {
- Dmsg4(100, "Storage=%s media_type=%s pool=%s pool_type=%s\n",
- store->name, store->media_type, store->pool_name,
- store->pool_type);
- foreach_alist(device_name, store->device) {
- Dmsg1(100, " Device=%s\n", device_name);
- }
- }
-#endif
-
- /*
- * At this point, we have a list of all the Director's Storage
- * resources indicated for this Job, which include Pool, PoolType,
- * storage name, and Media type.
- * Then for each of the Storage resources, we have a list of
- * device names that were given.
- *
- * Wiffle through them and find one that can do the backup.
- */
- if (ok) {
- store = (DIRSTORE *)dirstore->first();
- foreach_alist(device_name, store->device) {
- if (search_res_for_device(jcr, store, device_name, append) == 1) {
- dcr = jcr->dcr;
- dcr->Copy = Copy;
- dcr->Stripe = Stripe;
- ok = true;
- goto done;
- }
- }
- if (verbose) {
- 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());
- Dmsg1(100, ">dird: %s\n", dir->msg);
- ok = false;
- } 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, _("Bad Use Device command: %s\n"), jcr->errmsg);
- bnet_fsend(dir, BAD_use, jcr->errmsg);
- Dmsg1(100, ">dird: %s\n", dir->msg);
- ok = false;
- }
-
-done:
- foreach_alist(store, dirstore) {
- delete store->device;
- delete store;
- }
- delete dirstore;
- if (!ok && dcr) {
- free_dcr(dcr);
- }
- return ok;
-}
-
-/*
- * Returns: 1 -- OK, have DCR
- * 0 -- must wait
- * -1 -- fatal error
- */
-static int search_res_for_device(JCR *jcr, DIRSTORE *store, char *device_name, int append)
-{
- DEVRES *device;
- AUTOCHANGER *changer;
- BSOCK *dir = jcr->dir_bsock;
- bool ok;
- DCR *dcr;
-
- Dmsg1(100, "Search res for %s\n", device_name);
- foreach_res(device, R_DEVICE) {
- Dmsg1(100, "Try res=%s\n", device->hdr.name);
- /* Find resource, and make sure we were able to open it */
- if (fnmatch(device_name, device->hdr.name, 0) == 0 &&
- strcmp(device->media_type, store->media_type) == 0) {
- const int name_len = MAX_NAME_LENGTH;
- if (!device->dev) {
- device->dev = init_dev(jcr, NULL, device);
- }
- if (!device->dev) {
- Jmsg(jcr, M_WARNING, 0, _("\n"
- " Device \"%s\" requested by DIR could not be opened or does not exist.\n"),
- device_name);
- bnet_fsend(dir, NOT_open, device_name);
- Dmsg1(100, ">dird: %s\n", dir->msg);
- return -1;
- }
- Dmsg1(100, "Found device %s\n", device->hdr.name);
- dcr = new_dcr(jcr, device->dev);
- if (!dcr) {
- bnet_fsend(dir, _("3926 Could not get dcr for device: %s\n"), device_name);
- Dmsg1(100, ">dird: %s\n", dir->msg);
- return -1;
- }
- jcr->dcr = dcr;
- bstrncpy(dcr->pool_name, store->pool_name, name_len);
- bstrncpy(dcr->pool_type, store->pool_type, name_len);
- bstrncpy(dcr->media_type, store->media_type, name_len);
- bstrncpy(dcr->dev_name, device_name, name_len);
- if (append == SD_APPEND) {
- ok = reserve_device_for_append(dcr);
- } else {
- ok = reserve_device_for_read(dcr);
- }
- if (!ok) {
- bnet_fsend(dir, _("3927 Could not reserve device: %s\n"), device_name);
- Dmsg1(100, ">dird: %s\n", dir->msg);
- free_dcr(jcr->dcr);
- return 0;
- }
- Dmsg1(220, "Got: %s", dir->msg);
- bash_spaces(device_name);
- ok = bnet_fsend(dir, OK_device, device_name);
- Dmsg1(100, ">dird: %s\n", dir->msg);
- return ok;
- }
- }
- foreach_res(changer, R_AUTOCHANGER) {
- Dmsg1(100, "Try changer res=%s\n", changer->hdr.name);
- /* Find resource, and make sure we were able to open it */
- if (fnmatch(device_name, changer->hdr.name, 0) == 0) {
- const int name_len = MAX_NAME_LENGTH;
- /* 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", device_name);
- 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, device_name);
- continue;
- }
- if (!device->dev->autoselect) {
- continue; /* device is not available */
- }
- dcr = new_dcr(jcr, device->dev);
- if (!dcr) {
- bnet_fsend(dir, _("3926 Could not get dcr for device: %s\n"), device_name);
- Dmsg1(100, ">dird: %s\n", dir->msg);
- return -1;
- }
- Dmsg1(100, "Found changer device %s\n", device->hdr.name);
- bstrncpy(dcr->pool_name, store->pool_name, name_len);
- bstrncpy(dcr->pool_type, store->pool_type, name_len);
- bstrncpy(dcr->media_type, store->media_type, name_len);
- bstrncpy(dcr->dev_name, device_name, name_len);
- jcr->dcr = dcr;
- if (append == SD_APPEND) {
- ok = reserve_device_for_append(dcr);
- } else {
- ok = reserve_device_for_read(dcr);
- }
- if (!ok) {
- Jmsg(jcr, M_WARNING, 0, _("Could not reserve device: %s\n"), device_name);
- free_dcr(jcr->dcr);
- continue;
- }
- POOL_MEM dev_name;
- Dmsg1(100, "Device %s opened.\n", device_name);
- pm_strcpy(dev_name, device->hdr.name);
- bash_spaces(dev_name);
- ok = bnet_fsend(dir, OK_device, dev_name.c_str()); /* Return real device name */
- Dmsg1(100, ">dird: %s\n", dir->msg);
- return ok;
- }
- }
- }
- return 0;
-}
-
-
#ifdef needed
/*
* Query Device command from Director
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 (strcmp(dev_name.c_str(), device->hdr.name) == 0) {
if (!device->dev) {
- device->dev = init_dev(jcr, NULL, device);
+ device->dev = init_dev(jcr, device);
}
if (!device->dev) {
break;
}
-// UnlockRes();
ok = dir_update_device(jcr, device->dev);
if (ok) {
- ok = bnet_fsend(dir, OK_query);
+ ok = dir->fsend(OK_query);
} else {
- bnet_fsend(dir, NO_query);
+ dir->fsend(NO_query);
}
return ok;
}
}
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 (strcmp(dev_name.c_str(), changer->hdr.name) == 0) {
if (!changer->device || changer->device->size() == 0) {
continue; /* no devices */
}
ok = dir_update_changer(jcr, changer);
if (ok) {
- ok = bnet_fsend(dir, OK_query);
+ ok = dir->fsend(OK_query);
} else {
- bnet_fsend(dir, NO_query);
+ dir->fsend(NO_query);
}
return ok;
}
}
/* 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());
+ dir->fsend(NO_device, dev_name.c_str());
Dmsg1(100, ">dird: %s\n", dir->msg);
} else {
unbash_spaces(dir->msg);
pm_strcpy(jcr->errmsg, dir->msg);
- bnet_fsend(dir, BAD_query, jcr->errmsg);
+ dir->fsend(BAD_query, jcr->errmsg);
Dmsg1(100, ">dird: %s\n", dir->msg);
}
*/
void stored_free_jcr(JCR *jcr)
{
+ Dmsg2(800, "End Job JobId=%u %p\n", jcr->JobId, jcr);
+ if (jcr->dir_bsock) {
+ Dmsg2(800, "Send terminate jid=%d %p\n", jcr->JobId, jcr);
+ jcr->dir_bsock->signal(BNET_EOD);
+ jcr->dir_bsock->signal(BNET_TERMINATE);
+ }
if (jcr->file_bsock) {
- bnet_close(jcr->file_bsock);
+ jcr->file_bsock->close();
jcr->file_bsock = NULL;
}
if (jcr->job_name) {
free_bsr(jcr->bsr);
jcr->bsr = NULL;
}
+ /* Free any restore volume list created */
+ free_restore_volume_list(jcr);
if (jcr->RestoreBootstrap) {
unlink(jcr->RestoreBootstrap);
free_pool_memory(jcr->RestoreBootstrap);
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;
}
+ if (jcr->read_dcr) {
+ 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;
+ }
+ Dsm_check(200);
+
+ if (jcr->JobId != 0)
+ write_state_file(me->working_directory, "bacula-sd", get_first_port_host_order(me->sdaddrs));
+
return;
}