* Version $Id$
*/
/*
- Copyright (C) 2000-2005 Kern Sibbald
+ 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
#include "bacula.h"
#include "dird.h"
+#include "findlib/find.h"
/* Commands sent to File daemon */
static char filesetcmd[] = "fileset%s\n"; /* set full fileset */
-static char jobcmd[] = "JobId=%d Job=%s SDid=%u SDtime=%u Authorization=%s\n";
+static char jobcmd[] = "JobId=%s Job=%s SDid=%u SDtime=%u Authorization=%s\n";
/* Note, mtime_only is not used here -- implemented as file option */
static char levelcmd[] = "level = %s%s mtime_only=%d\n";
-static char runbefore[] = "RunBeforeJob %s\n";
-static char runafter[] = "RunAfterJob %s\n";
-
+static char runscript[] = "Run OnSuccess=%u OnFailure=%u AbortOnError=%u When=%u Command=%s\n";
+static char runbeforenow[]= "RunBeforeNow\n";
/* Responses received from File daemon */
-static char OKinc[] = "2000 OK include\n";
-static char OKjob[] = "2000 OK Job";
-static char OKbootstrap[] = "2000 OK bootstrap\n";
-static char OKlevel[] = "2000 OK level\n";
-static char OKRunBefore[] = "2000 OK RunBefore\n";
-static char OKRunAfter[] = "2000 OK RunAfter\n";
+static char OKinc[] = "2000 OK include\n";
+static char OKjob[] = "2000 OK Job";
+static char OKlevel[] = "2000 OK level\n";
+static char OKRunScript[] = "2000 OK RunScript\n";
+static char OKRunBeforeNow[] = "2000 OK RunBeforeNow\n";
/* Forward referenced functions */
int verbose)
{
BSOCK *fd;
+ char ed1[30];
if (!jcr->file_bsock) {
fd = bnet_connect(jcr, retry_interval, max_retry_time,
/*
* Now send JobId and authorization key
*/
- bnet_fsend(fd, jobcmd, jcr->JobId, jcr->Job, jcr->VolSessionId,
+ bnet_fsend(fd, jobcmd, edit_int64(jcr->JobId, ed1), jcr->Job, jcr->VolSessionId,
jcr->VolSessionTime, jcr->sd_auth_key);
if (strcmp(jcr->sd_auth_key, "dummy") != 0) {
memset(jcr->sd_auth_key, 0, strlen(jcr->sd_auth_key));
char ed1[50];
stime = str_to_utime(jcr->stime);
- bnet_fsend(fd, levelcmd, _("since_utime "), edit_uint64(stime, ed1), 0);
+ bnet_fsend(fd, levelcmd, NT_("since_utime "), edit_uint64(stime, ed1), 0);
while (bget_dirmsg(fd) >= 0) { /* allow him to poll us to sync clocks */
Jmsg(jcr, M_INFO, 0, "%s\n", fd->msg);
}
/*
* Send either an Included or an Excluded list to FD
*/
-static int send_fileset(JCR *jcr)
+static bool send_fileset(JCR *jcr)
{
FILESET *fileset = jcr->fileset;
BSOCK *fd = jcr->file_bsock;
if (!response(jcr, fd, OKinc, "Include", DISPLAY_ERROR)) {
goto bail_out;
}
- return 1;
+ return true;
bail_out:
set_jcr_job_status(jcr, JS_ErrorTerminated);
- return 0;
+ return false;
}
/*
- * Send bootstrap file if any to the File daemon.
- * This is used for restore and verify VolumeToCatalog
+ * Send bootstrap file if any to the socket given (FD or SD).
+ * This is used for restore, verify VolumeToCatalog, and
+ * for migration.
*/
-bool send_bootstrap_file(JCR *jcr)
+bool send_bootstrap_file(JCR *jcr, BSOCK *sock)
{
FILE *bs;
char buf[1000];
- BSOCK *fd = jcr->file_bsock;
const char *bootstrap = "bootstrap\n";
Dmsg1(400, "send_bootstrap_file: %s\n", jcr->RestoreBootstrap);
if (!jcr->RestoreBootstrap) {
- return 1;
+ return true;
}
bs = fopen(jcr->RestoreBootstrap, "r");
if (!bs) {
Jmsg(jcr, M_FATAL, 0, _("Could not open bootstrap file %s: ERR=%s\n"),
jcr->RestoreBootstrap, be.strerror());
set_jcr_job_status(jcr, JS_ErrorTerminated);
- return 0;
+ return false;
}
- bnet_fsend(fd, bootstrap);
+ bnet_fsend(sock, bootstrap);
while (fgets(buf, sizeof(buf), bs)) {
- bnet_fsend(fd, "%s", buf);
+ bnet_fsend(sock, "%s", buf);
}
- bnet_sig(fd, BNET_EOD);
+ bnet_sig(sock, BNET_EOD);
fclose(bs);
if (jcr->unlink_bsr) {
unlink(jcr->RestoreBootstrap);
jcr->unlink_bsr = false;
}
- if (!response(jcr, fd, OKbootstrap, "Bootstrap", DISPLAY_ERROR)) {
- set_jcr_job_status(jcr, JS_ErrorTerminated);
- return 0;
- }
- return 1;
+ return true;
}
/*
- * Send ClientRunBeforeJob and ClientRunAfterJob to File daemon
+ * Send RunScripts to File daemon
*/
-int send_run_before_and_after_commands(JCR *jcr)
+int send_runscripts_commands(JCR *jcr)
{
POOLMEM *msg = get_pool_memory(PM_FNAME);
BSOCK *fd = jcr->file_bsock;
- if (jcr->job->ClientRunBeforeJob) {
- pm_strcpy(msg, jcr->job->ClientRunBeforeJob);
- bash_spaces(msg);
- bnet_fsend(fd, runbefore, msg);
- if (!response(jcr, fd, OKRunBefore, "ClientRunBeforeJob", DISPLAY_ERROR)) {
- set_jcr_job_status(jcr, JS_ErrorTerminated);
- free_pool_memory(msg);
- return 0;
- }
+ RUNSCRIPT *cmd;
+ bool launch_before_cmd = false;
+ POOLMEM *ehost = get_pool_memory(PM_FNAME);
+
+ Dmsg0(120, "bdird: sending runscripts to fd\n");
+
+ foreach_alist(cmd, jcr->job->RunScripts) {
+
+ if (cmd->can_run_at_level(jcr->JobLevel) && cmd->target) {
+
+ ehost = edit_job_codes(jcr, ehost, cmd->target, "");
+ Dmsg2(200, "bdird: runscript %s -> %s\n", cmd->target, ehost);
+
+ if (strcmp(ehost, jcr->client->hdr.name) == 0) {
+ pm_strcpy(msg, cmd->command);
+ bash_spaces(msg);
+ bnet_fsend(fd, runscript, cmd->on_success,
+ cmd->on_failure,
+ cmd->abort_on_error,
+ cmd->when,
+ msg);
+
+ Dmsg1(120, "bdird: sending runscripts to fd '%s'\n", cmd->command);
+
+ if (!response(jcr, fd, OKRunScript, "RunScript", DISPLAY_ERROR)) {
+ set_jcr_job_status(jcr, JS_ErrorTerminated);
+ free_pool_memory(msg);
+ free_pool_memory(ehost);
+ return 0;
+ }
+ launch_before_cmd=true;
+ }
+ /*
+ else {
+ send command to an other client
+ }
+ */
+ }
}
- if (jcr->job->ClientRunAfterJob) {
- fd->msglen = pm_strcpy(msg, jcr->job->ClientRunAfterJob);
- bash_spaces(msg);
- bnet_fsend(fd, runafter, msg);
- if (!response(jcr, fd, OKRunAfter, "ClientRunAfterJob", DISPLAY_ERROR)) {
- set_jcr_job_status(jcr, JS_ErrorTerminated);
- free_pool_memory(msg);
- return 0;
+
+ /* TODO : we have to play with other client */
+ if (launch_before_cmd) {
+ bnet_fsend(fd, runbeforenow);
+ if (!response(jcr, fd, OKRunBeforeNow, "RunBeforeNow", DISPLAY_ERROR)) {
+ set_jcr_job_status(jcr, JS_ErrorTerminated);
+ free_pool_memory(msg);
+ free_pool_memory(ehost);
+ return 0;
}
}
free_pool_memory(msg);
+ free_pool_memory(ehost);
return 1;
}
jcr->FileIndex = 0;
Dmsg0(120, "bdird: waiting to receive file attributes\n");
- /* Pickup file attributes and signature */
+ /* Pickup file attributes and digest */
while (!fd->errors && (n = bget_dirmsg(fd)) > 0) {
/*****FIXME****** improve error handling to stop only on
long file_index;
int stream, len;
char *attr, *p, *fn;
- char Opts_SIG[MAXSTRING]; /* either Verify opts or MD5/SHA1 signature */
- char SIG[MAXSTRING];
+ char Opts_Digest[MAXSTRING]; /* either Verify opts or MD5/SHA1 digest */
+ char digest[CRYPTO_DIGEST_MAX_SIZE];
jcr->fname = check_pool_memory_size(jcr->fname, fd->msglen);
- if ((len = sscanf(fd->msg, "%ld %d %s", &file_index, &stream, Opts_SIG)) != 3) {
+ if ((len = sscanf(fd->msg, "%ld %d %s", &file_index, &stream, Opts_Digest)) != 3) {
Jmsg(jcr, M_FATAL, 0, _("<filed: bad attributes, expected 3 fields got %d\n"
"msglen=%d msg=%s\n"), len, fd->msglen, fd->msg);
set_jcr_job_status(jcr, JS_ErrorTerminated);
ar.ClientId = jcr->ClientId;
ar.PathId = 0;
ar.FilenameId = 0;
- ar.Sig = NULL;
- ar.SigType = 0;
+ ar.Digest = NULL;
+ ar.DigestType = CRYPTO_DIGEST_NONE;
Dmsg2(111, "dird<filed: stream=%d %s\n", stream, jcr->fname);
Dmsg1(120, "dird<filed: attr=%s\n", attr);
continue;
}
jcr->FileId = ar.FileId;
- } else if (stream == STREAM_MD5_SIGNATURE || stream == STREAM_SHA1_SIGNATURE) {
+ } else if (crypto_digest_stream_type(stream) != CRYPTO_DIGEST_NONE) {
if (jcr->FileIndex != (uint32_t)file_index) {
- Jmsg2(jcr, M_ERROR, 0, _("MD5/SHA1 index %d not same as attributes %d\n"),
- file_index, jcr->FileIndex);
+ Jmsg3(jcr, M_ERROR, 0, _("%s index %d not same as attributes %d\n"),
+ stream_to_ascii(stream), file_index, jcr->FileIndex);
set_jcr_job_status(jcr, JS_Error);
continue;
}
- db_escape_string(SIG, Opts_SIG, strlen(Opts_SIG));
- Dmsg2(120, "SIGlen=%d SIG=%s\n", strlen(SIG), SIG);
- if (!db_add_SIG_to_file_record(jcr, jcr->db, jcr->FileId, SIG,
- stream==STREAM_MD5_SIGNATURE?MD5_SIG:SHA1_SIG)) {
+ db_escape_string(digest, Opts_Digest, strlen(Opts_Digest));
+ Dmsg2(120, "DigestLen=%d Digest=%s\n", strlen(digest), digest);
+ if (!db_add_digest_to_file_record(jcr, jcr->db, jcr->FileId, digest,
+ crypto_digest_stream_type(stream))) {
Jmsg1(jcr, M_ERROR, 0, "%s", db_strerror(jcr->db));
set_jcr_job_status(jcr, JS_Error);
}
projects / bacula / bacula / blobdiff