/*
- * Job control and execution for Storage Daemon
- *
- * Kern Sibbald, MM
- *
- * Version $Id$
- *
- */
-/*
- Copyright (C) 2000-2005 Kern Sibbald
+ Bacula(R) - The Network Backup Solution
- 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.
+ Copyright (C) 2000-2016 Kern Sibbald
- 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.
+ The original author of Bacula is Kern Sibbald, with contributions
+ from many others, a complete list can be found in the file AUTHORS.
- 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 may use this file and others of this release according to the
+ license defined in the LICENSE file, which includes the Affero General
+ Public License, v3.0 ("AGPLv3") and some additional permissions and
+ terms pursuant to its AGPLv3 Section 7.
+ This notice must be preserved when any source code is
+ conveyed and/or propagated.
+
+ Bacula(R) is a registered trademark of Kern Sibbald.
+*/
+/*
+ * Job control and execution for Storage Daemon
+ *
+ * Written by Kern Sibbald, MM
+ *
*/
#include "bacula.h"
#include "stored.h"
+static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
+
/* Imported variables */
+extern STORES *me; /* our Global resource */
extern uint32_t VolSessionTime;
/* Imported functions */
extern uint32_t newVolSessionId();
-
-/* Forward referenced functions */
-static bool use_device_cmd(JCR *jcr);
+extern bool do_vbackup(JCR *jcr);
/* Requests from the Director daemon */
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";
-static char use_device[] = "use device=%127s media_type=%127s "
- "pool_name=%127s pool_type=%127s append=%d";
-static char query_device[] = "query device=%127s";
-
+ "SpoolData=%d WritePartAfterJob=%d PreferMountedVols=%d SpoolSize=%s "
+ "rerunning=%d VolSessionId=%d VolSessionTime=%d sd_client=%d "
+ "Authorization=%s\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 append=%d read=%d num_writers=%d "
- "num_waiting=%d open=%d use_count=%d labeled=%d offline=%d "
- "autoselect=%d autochanger=%d "
- "changer_name=%s media_type=%s volume_name=%s";
-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;
- char auth_key[100];
+ int32_t JobId;
+ char sd_auth_key[200];
+ 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, write_part_after_job;
+ int32_t JobType, level, spool_attributes, no_attributes, spool_data;
+ int32_t write_part_after_job, PreferMountedVols;
+ int32_t rerunning;
+ int32_t is_client;
+ int stat;
JCR *ojcr;
/*
* Get JobId and permissions from Director
*/
- Dmsg1(100, "Job_cmd: %s\n", dir->msg);
- if (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) != 12) {
+ 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, &PreferMountedVols, spool_size,
+ &rerunning, &jcr->VolSessionId, &jcr->VolSessionTime,
+ &is_client, &sd_auth_key);
+ if (stat != 19) {
pm_strcpy(jcr->errmsg, dir->msg);
- bnet_fsend(dir, BAD_job, jcr->errmsg);
- 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;
}
+ jcr->rerunning = rerunning;
+ jcr->sd_client = is_client;
+ if (is_client) {
+ jcr->sd_auth_key = bstrdup(sd_auth_key);
+ }
+ 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);
+ set_jcr_in_tsd(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->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(110, ">dird: %s", dir->msg);
- jcr->sd_auth_key = bstrdup(auth_key);
- memset(auth_key, 0, sizeof(auth_key));
- return true;
-}
-
-bool use_cmd(JCR *jcr)
-{
- /*
- * Wait for the device, media, and pool information
- */
- Dmsg1(100, "Use_cmd: %s\n", jcr->dir_bsock->msg);
- if (!use_device_cmd(jcr)) {
- set_jcr_job_status(jcr, JS_ErrorTerminated);
- memset(jcr->sd_auth_key, 0, strlen(jcr->sd_auth_key));
- return false;
+ if (jcr->sd_client) {
+ bstrncpy(sd_auth_key, "xxx", 3);
+ } else {
+ bsnprintf(seed, sizeof(seed), "%p%d", jcr, JobId);
+ make_session_key(sd_auth_key, seed, 1);
+ }
+ dir->fsend(OKjob, jcr->VolSessionId, jcr->VolSessionTime, sd_auth_key);
+ Dmsg2(150, ">dird jid=%u: %s", (uint32_t)jcr->JobId, dir->msg);
+ /* If not client, set key, otherwise it is already set */
+ if (!jcr->sd_client) {
+ jcr->sd_auth_key = bstrdup(sd_auth_key);
+ memset(sd_auth_key, 0, sizeof(sd_auth_key));
}
+ new_plugins(jcr); /* instantiate the plugins */
+ generate_daemon_event(jcr, "JobStart");
+ 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 virtual backup. */
+ if (jcr->no_client_used()) {
+ do_vbackup(jcr);
return false;
}
- set_jcr_job_status(jcr, JS_WaitFD); /* wait for FD to connect */
- dir_send_job_status(jcr);
-
- gettimeofday(&tv, &tz);
- timeout.tv_nsec = tv.tv_usec * 1000;
- timeout.tv_sec = tv.tv_sec + 30 * 60; /* wait 30 minutes */
+ jcr->sendJobStatus(JS_WaitFD); /* wait for FD to connect */
- 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) {
- break;
+ Dmsg2(050, "sd_calls_client=%d sd_client=%d\n", jcr->sd_calls_client, jcr->sd_client);
+ if (jcr->sd_calls_client) {
+ if (!read_client_hello(jcr)) {
+ return false;
+ }
+ /*
+ * Authenticate the File daemon
+ */
+ Dmsg0(050, "=== Authenticate FD\n");
+ if (jcr->authenticated || !authenticate_filed(jcr, jcr->file_bsock, jcr->FDVersion)) {
+ Dmsg1(050, "Authentication failed Job %s\n", jcr->Job);
+ Jmsg(jcr, M_FATAL, 0, _("Unable to authenticate File daemon\n"));
+ } else {
+ jcr->authenticated = true;
+ }
+ } else if (!jcr->sd_client) {
+ /* We wait to receive connection from Client */
+ gettimeofday(&tv, &tz);
+ timeout.tv_nsec = tv.tv_usec * 1000;
+ timeout.tv_sec = tv.tv_sec + me->client_wait;
+
+ Dmsg3(050, "%s waiting %d sec for FD to contact SD key=%s\n",
+ jcr->Job, (int)(timeout.tv_sec-time(NULL)), jcr->sd_auth_key);
+
+ Dmsg3(800, "=== Block Job=%s jid=%d %p\n", jcr->Job, jcr->JobId, jcr);
+
+ /*
+ * 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);
+ 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);
}
+ Dmsg4(050, "=== Auth=%d jid=%d canceled=%d errstat=%d\n",
+ jcr->JobId, jcr->authenticated, job_canceled(jcr), errstat);
+ V(mutex);
+ Dmsg2(800, "Auth fail or cancel for jid=%d %p\n", jcr->JobId, jcr);
}
- V(jcr->mutex);
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);
- run_job(jcr); /* Run the 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
- * 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 */
- 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);
- return;
- }
-
- jcr->file_bsock = fd;
- jcr->file_bsock->jcr = jcr;
-
- Dmsg1(110, "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);
- free_jcr(jcr);
- return;
- }
-
- /*
- * Authenticate the File daemon
- */
- if (jcr->authenticated || !authenticate_filed(jcr)) {
- Dmsg1(100, "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);
- }
-
- 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;
-}
-
-
-/*
- * 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.
- */
-static bool use_device_cmd(JCR *jcr)
-{
- POOL_MEM dev_name, media_type, pool_name, pool_type;
- BSOCK *dir = jcr->dir_bsock;
- DEVRES *device;
- AUTOCHANGER *changer;
- int append;
- bool ok;
-
- Dmsg1(100, "Use_device_cmd: %s", jcr->dir_bsock->msg);
- /*
- * If there are multiple devices, the director sends us
- * use_device for each device that it wants to use.
- */
- ok = sscanf(dir->msg, use_device, dev_name.c_str(), media_type.c_str(),
- pool_name.c_str(), pool_type.c_str(), &append) == 5;
- if (ok) {
- unbash_spaces(dev_name);
- unbash_spaces(media_type);
- unbash_spaces(pool_name);
- unbash_spaces(pool_type);
- 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 &&
- strcmp(device->media_type, media_type.c_str()) == 0) {
- const int name_len = MAX_NAME_LENGTH;
- DCR *dcr;
- UnlockRes();
- 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"),
- dev_name.c_str());
- bnet_fsend(dir, NOT_open, dev_name.c_str());
- return false;
- }
- dcr = new_dcr(jcr, device->dev);
- if (!dcr) {
- bnet_fsend(dir, _("3926 Could not get dcr for device: %s\n"), dev_name.c_str());
- return false;
- }
- Dmsg1(100, "Found device %s\n", device->hdr.name);
- bstrncpy(dcr->pool_name, pool_name, name_len);
- bstrncpy(dcr->pool_type, pool_type, name_len);
- bstrncpy(dcr->media_type, media_type, name_len);
- bstrncpy(dcr->dev_name, dev_name, name_len);
- jcr->dcr = dcr;
- if (append == SD_APPEND) {
- ok = reserve_device_for_append(jcr, device->dev);
- } else {
- ok = reserve_device_for_read(jcr, device->dev);
- }
- if (!ok) {
- bnet_fsend(dir, _("3927 Could not reserve device: %s\n"), dev_name.c_str());
- free_dcr(jcr->dcr);
- return false;
- }
- Dmsg1(220, "Got: %s", dir->msg);
- bash_spaces(dev_name);
- return bnet_fsend(dir, OK_device, dev_name.c_str());
- }
- }
-
- 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) {
- const int name_len = MAX_NAME_LENGTH;
- DCR *dcr;
- /* 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", dev_name.c_str());
- 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, dev_name.c_str());
- 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"), dev_name.c_str());
- UnlockRes();
- return false;
- }
- Dmsg1(100, "Found changer device %s\n", device->hdr.name);
- bstrncpy(dcr->pool_name, pool_name, name_len);
- bstrncpy(dcr->pool_type, pool_type, name_len);
- bstrncpy(dcr->media_type, media_type, name_len);
- bstrncpy(dcr->dev_name, dev_name, name_len);
- jcr->dcr = dcr;
- if (append == SD_APPEND) {
- ok = reserve_device_for_append(jcr, device->dev);
- } else {
- ok = reserve_device_for_read(jcr, device->dev);
- }
- if (!ok) {
- Jmsg(jcr, M_WARNING, 0, _("Could not reserve device: %s\n"), dev_name.c_str());
- free_dcr(jcr->dcr);
- continue;
- }
- Dmsg1(100, "Device %s opened.\n", dev_name.c_str());
- UnlockRes();
- pm_strcpy(dev_name, device->hdr.name);
- bash_spaces(dev_name);
- return bnet_fsend(dir, OK_device, dev_name.c_str());
- }
- break; /* we found it but could not open a device */
- }
- }
-
- UnlockRes();
- 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());
- } 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);
- }
-
- return false; /* ERROR return */
-}
+#ifdef needed
/*
* Query Device command from Director
* Sends Storage Daemon's information on the device to the
*/
bool query_cmd(JCR *jcr)
{
- POOL_MEM dev_name;
+ POOL_MEM dev_name, VolumeName, MediaType, ChangerName;
BSOCK *dir = jcr->dir_bsock;
DEVRES *device;
AUTOCHANGER *changer;
bool ok;
Dmsg1(100, "Query_cmd: %s", dir->msg);
-
ok = sscanf(dir->msg, query_device, dev_name.c_str()) == 1;
+ 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) {
- device->dev = init_dev(jcr, NULL, device);
- }
- if (!device->dev) {
- break;
- }
- DEVICE *dev = device->dev;
- POOL_MEM VolumeName, MediaType, ChangerName;
- UnlockRes();
- if (dev->is_labeled()) {
- pm_strcpy(VolumeName, dev->VolHdr.VolName);
- } else {
- pm_strcpy(VolumeName, "");
- }
- bash_spaces(VolumeName);
- pm_strcpy(MediaType, device->media_type);
- bash_spaces(MediaType);
- if (device->changer_res) {
- pm_strcpy(ChangerName, device->changer_res->hdr.name);
- bash_spaces(ChangerName);
- } else {
- pm_strcpy(ChangerName, "");
- }
- return bnet_fsend(dir, OK_query, dev->can_append()!=0,
- dev->can_read()!=0, dev->num_writers, dev->num_waiting,
- dev->is_open()!=0, dev->use_count, dev->is_labeled()!=0,
- dev->is_offline()!=0, 0, dev->autoselect,
- ChangerName.c_str(), MediaType.c_str(), VolumeName.c_str());
- }
+ /* Find resource, and make sure we were able to open it */
+ if (strcmp(dev_name.c_str(), device->hdr.name) == 0) {
+ if (!device->dev) {
+ device->dev = init_dev(jcr, device);
+ }
+ if (!device->dev) {
+ break;
+ }
+ ok = dir_update_device(jcr, device->dev);
+ if (ok) {
+ ok = dir->fsend(OK_query);
+ } else {
+ 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();
- /* This is mostly to indicate that we are here */
- return bnet_fsend(dir, OK_query, 0,
- 0, 0, 0,
- 0, 0, 0,
- 0, 1, "*", /* Set AutoChanger = 1 */
- "*", "*");
- }
+ /* Find resource, and make sure we were able to open it */
+ 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 = dir->fsend(OK_query);
+ } else {
+ 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);
}
return true;
}
+#endif
+
/*
* Destroy the Job Control Record and associated
*/
void stored_free_jcr(JCR *jcr)
{
- if (jcr->file_bsock) {
- bnet_close(jcr->file_bsock);
- jcr->file_bsock = NULL;
+ Dmsg2(800, "End Job JobId=%u %p\n", jcr->JobId, jcr);
+ if (jcr->jobmedia_queue) {
+ flush_jobmedia_queue(jcr);
+ delete jcr->jobmedia_queue;
+ jcr->jobmedia_queue = NULL;
+ }
+ 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);
}
+ free_bsock(jcr->file_bsock);
if (jcr->job_name) {
free_pool_memory(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;
}
projects / bacula / bacula / blobdiff