/*
Bacula® - The Network Backup Solution
- Copyright (C) 2000-2008 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2009 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
+ 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.
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
+ 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.
* Create a thread to interact with the Storage daemon
* who returns a job status and requests Catalog services, etc.
*
- * Version $Id$
*/
#include "bacula.h"
/* Commands sent to Storage daemon */
static char jobcmd[] = "JobId=%s job=%s job_name=%s client_name=%s "
"type=%d level=%d FileSet=%s NoAttr=%d SpoolAttr=%d FileSetMD5=%s "
- "SpoolData=%d WritePartAfterJob=%d PreferMountedVols=%d SpoolSize=%s\n";
+ "SpoolData=%d WritePartAfterJob=%d PreferMountedVols=%d SpoolSize=%s "
+ "rerunning=%d VolSessionId=%d VolSessionTime=%d\n";
static char use_storage[] = "use storage=%s media_type=%s pool_name=%s "
"pool_type=%s append=%d copy=%d stripe=%d\n";
static char use_device[] = "use device=%s\n";
}
sd->fsend(jobcmd, edit_int64(jcr->JobId, ed1), jcr->Job,
job_name.c_str(), client_name.c_str(),
- jcr->get_JobType(), jcr->get_JobLevel(),
+ jcr->getJobType(), jcr->getJobLevel(),
fileset_name.c_str(), !jcr->pool->catalog_files,
jcr->job->SpoolAttributes, jcr->fileset->MD5, jcr->spool_data,
jcr->write_part_after_job, jcr->job->PreferMountedVolumes,
- edit_int64(jcr->spool_size, ed2));
+ edit_int64(jcr->spool_size, ed2), jcr->rerunning,
+ jcr->VolSessionId, jcr->VolSessionTime);
Dmsg1(100, ">stored: %s", sd->msg);
if (bget_dirmsg(sd) > 0) {
Dmsg1(100, "<stored: %s", sd->msg);
Jmsg(jcr, M_FATAL, 0, _("Storage daemon rejected Job command: %s\n"), sd->msg);
return false;
} else {
+ bfree_and_null(jcr->sd_auth_key);
jcr->sd_auth_key = bstrdup(auth_key);
Dmsg1(150, "sd_auth_key=%s\n", jcr->sd_auth_key);
}
/* Do read side of storage daemon */
if (ok && rstore) {
/* For the moment, only migrate, copy and vbackup have rpool */
- if (jcr->get_JobType() == JT_MIGRATE || jcr->get_JobType() == JT_COPY ||
- (jcr->get_JobType() == JT_BACKUP && jcr->get_JobLevel() == L_VIRTUAL_FULL)) {
+ if (jcr->is_JobType(JT_MIGRATE) || jcr->is_JobType(JT_COPY) ||
+ (jcr->is_JobType(JT_BACKUP) && jcr->is_JobLevel(L_VIRTUAL_FULL))) {
pm_strcpy(pool_type, jcr->rpool->pool_type);
pm_strcpy(pool_name, jcr->rpool->name());
} else {
} else {
ok = false;
}
+ if (ok) {
+ Jmsg(jcr, M_INFO, 0, _("Using Device \"%s\" to read.\n"), device_name.c_str());
+ }
}
/* Do write side of storage daemon */
} else {
ok = false;
}
+ if (ok) {
+ Jmsg(jcr, M_INFO, 0, _("Using Device \"%s\" to write.\n"), device_name.c_str());
+ }
}
if (!ok) {
POOL_MEM err_msg;
" Storage daemon didn't accept Device \"%s\" command.\n"),
device_name.c_str());
}
- } else {
- Jmsg(jcr, M_INFO, 0, _("Using Device \"%s\"\n"), device_name.c_str());
}
return ok;
}
extern "C" void msg_thread_cleanup(void *arg)
{
JCR *jcr = (JCR *)arg;
- db_end_transaction(jcr, jcr->db); /* terminate any open transaction */
+ db_end_transaction(jcr, jcr->db); /* terminate any open transaction */
+ jcr->lock();
jcr->sd_msg_thread_done = true;
jcr->SD_msg_chan = 0;
+ jcr->unlock();
pthread_cond_broadcast(&jcr->term_wait); /* wakeup any waiting threads */
Dmsg2(100, "=== End msg_thread. JobId=%d usecnt=%d\n", jcr->JobId, jcr->use_count());
- free_jcr(jcr); /* release jcr */
- db_thread_cleanup(); /* remove thread specific data */
+ db_thread_cleanup(jcr->db); /* remove thread specific data */
+ free_jcr(jcr); /* release jcr */
}
/*
JCR *jcr = (JCR *)arg;
BSOCK *sd;
int JobStatus;
+ int n;
char Job[MAX_NAME_LENGTH];
uint32_t JobFiles, JobErrors;
uint64_t JobBytes;
/* Read the Storage daemon's output.
*/
Dmsg0(100, "Start msg_thread loop\n");
- while (!job_canceled(jcr) && bget_dirmsg(sd) >= 0) {
+ n = 0;
+ while (!job_canceled(jcr) && (n=bget_dirmsg(sd)) >= 0) {
Dmsg1(400, "<stored: %s", sd->msg);
if (sscanf(sd->msg, Job_start, Job) == 1) {
continue;
}
Dmsg1(400, "end loop use=%d\n", jcr->use_count());
}
+ if (n == BNET_HARDEOF) {
+ /*
+ * This probably should be M_FATAL, but I am not 100% sure
+ * that this return *always* corresponds to a dropped line.
+ */
+ Qmsg(jcr, M_ERROR, 0, _("Director's comm line to SD dropped.\n"));
+ }
if (is_bnet_error(sd)) {
jcr->SDJobStatus = JS_ErrorTerminated;
}
P(mutex);
pthread_cond_timedwait(&jcr->term_wait, &mutex, &timeout);
V(mutex);
- if (job_canceled(jcr)) {
+ if (jcr->is_canceled()) {
if (jcr->SD_msg_chan) {
jcr->store_bsock->set_timed_out();
jcr->store_bsock->set_terminated();
- Dmsg2(400, "kill jobid=%d use=%d\n", (int)jcr->JobId, jcr->use_count());
- pthread_kill(jcr->SD_msg_chan, TIMEOUT_SIGNAL);
+ sd_msg_thread_send_signal(jcr, TIMEOUT_SIGNAL);
}
cancel_count++;
}
break;
}
}
- set_jcr_job_status(jcr, JS_Terminated);
+ jcr->setJobStatus(JS_Terminated);
}
+/*
+ * Send bootstrap file to Storage daemon.
+ * This is used for restore, verify VolumeToCatalog, migration,
+ * and copy Jobs.
+ */
+bool send_bootstrap_file(JCR *jcr, BSOCK *sd)
+{
+ FILE *bs;
+ char buf[1000];
+ const char *bootstrap = "bootstrap\n";
+
+ Dmsg1(400, "send_bootstrap_file: %s\n", jcr->RestoreBootstrap);
+ if (!jcr->RestoreBootstrap) {
+ return true;
+ }
+ bs = fopen(jcr->RestoreBootstrap, "rb");
+ if (!bs) {
+ berrno be;
+ Jmsg(jcr, M_FATAL, 0, _("Could not open bootstrap file %s: ERR=%s\n"),
+ jcr->RestoreBootstrap, be.bstrerror());
+ jcr->setJobStatus(JS_ErrorTerminated);
+ return false;
+ }
+ sd->fsend(bootstrap);
+ while (fgets(buf, sizeof(buf), bs)) {
+ sd->fsend("%s", buf);
+ }
+ sd->signal(BNET_EOD);
+ fclose(bs);
+ if (jcr->unlink_bsr) {
+ unlink(jcr->RestoreBootstrap);
+ jcr->unlink_bsr = false;
+ }
+ return true;
+}
+
+
#ifdef needed
#define MAX_TRIES 30
#define WAIT_TIME 2
projects / bacula / bacula / blobdiff