X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fdird%2Ffd_cmds.c;h=785d6794b8e1c16fd108aa06b01ae8cb15bbe219;hb=b8224aab234012c2d127b84eceb160e99dd4a14d;hp=24e13e6e2d7f2d1bf44c4f050e7d596f0b39f95b;hpb=19ec33747123174276b5dd8b0f5702c02e90465d;p=bacula%2Fbacula diff --git a/bacula/src/dird/fd_cmds.c b/bacula/src/dird/fd_cmds.c index 24e13e6e2d..785d6794b8 100644 --- a/bacula/src/dird/fd_cmds.c +++ b/bacula/src/dird/fd_cmds.c @@ -1,3 +1,30 @@ +/* + 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. +*/ /* * * Bacula Director -- fd_cmds.c -- send commands to File daemon @@ -12,53 +39,29 @@ * * 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 as - published by the Free Software Foundation; either version 2 of - the License, or (at your option) any later version. - - 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. - - */ #include "bacula.h" #include "dird.h" +#include "findlib/find.h" /* Commands sent to File daemon */ -static char inc[] = "include\n"; -static char exc[] = "exclude\n"; -static char fileset[] = "fileset\n"; /* set full fileset */ -static char jobcmd[] = "JobId=%d Job=%s SDid=%u SDtime=%u Authorization=%s\n"; +static char filesetcmd[] = "fileset%s\n"; /* set full fileset */ +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 OKexc[] = "2000 OK exclude\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 */ /* External functions */ -extern int debug_level; extern DIRRES *director; extern int FDConnectTimeout; @@ -72,21 +75,22 @@ extern int FDConnectTimeout; */ int connect_to_file_daemon(JCR *jcr, int retry_interval, int max_retry_time, - int verbose) + int verbose) { BSOCK *fd; + char ed1[30]; if (!jcr->file_bsock) { fd = bnet_connect(jcr, retry_interval, max_retry_time, _("File daemon"), jcr->client->address, - NULL, jcr->client->FDport, verbose); + NULL, jcr->client->FDport, verbose); if (fd == NULL) { - set_jcr_job_status(jcr, JS_ErrorTerminated); - return 0; + set_jcr_job_status(jcr, JS_ErrorTerminated); + return 0; } Dmsg0(10, "Opened connection with File daemon\n"); } else { - fd = jcr->file_bsock; /* use existing connection */ + fd = jcr->file_bsock; /* use existing connection */ } fd->res = (RES *)jcr->client; /* save resource in BSOCK */ jcr->file_bsock = fd; @@ -100,7 +104,7 @@ int connect_to_file_daemon(JCR *jcr, int retry_interval, int 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)); @@ -110,25 +114,25 @@ int connect_to_file_daemon(JCR *jcr, int retry_interval, int max_retry_time, Dmsg1(110, "msg); if (strncmp(fd->msg, OKjob, strlen(OKjob)) != 0) { Jmsg(jcr, M_FATAL, 0, _("File daemon \"%s\" rejected Job command: %s\n"), - jcr->client->hdr.name, fd->msg); - set_jcr_job_status(jcr, JS_ErrorTerminated); - return 0; + jcr->client->hdr.name, fd->msg); + set_jcr_job_status(jcr, JS_ErrorTerminated); + return 0; } else if (jcr->db) { - CLIENT_DBR cr; - memset(&cr, 0, sizeof(cr)); - bstrncpy(cr.Name, jcr->client->hdr.name, sizeof(cr.Name)); - cr.AutoPrune = jcr->client->AutoPrune; - cr.FileRetention = jcr->client->FileRetention; - cr.JobRetention = jcr->client->JobRetention; - bstrncpy(cr.Uname, fd->msg+strlen(OKjob)+1, sizeof(cr.Uname)); - if (!db_update_client_record(jcr, jcr->db, &cr)) { + CLIENT_DBR cr; + memset(&cr, 0, sizeof(cr)); + bstrncpy(cr.Name, jcr->client->hdr.name, sizeof(cr.Name)); + cr.AutoPrune = jcr->client->AutoPrune; + cr.FileRetention = jcr->client->FileRetention; + cr.JobRetention = jcr->client->JobRetention; + bstrncpy(cr.Uname, fd->msg+strlen(OKjob)+1, sizeof(cr.Uname)); + if (!db_update_client_record(jcr, jcr->db, &cr)) { Jmsg(jcr, M_WARNING, 0, _("Error updating Client record. ERR=%s\n"), - db_strerror(jcr->db)); - } + db_strerror(jcr->db)); + } } } else { Jmsg(jcr, M_FATAL, 0, _("FD gave bad response to JobId command: %s\n"), - bnet_strerror(fd)); + bnet_strerror(fd)); set_jcr_job_status(jcr, JS_ErrorTerminated); return 0; } @@ -145,40 +149,48 @@ int connect_to_file_daemon(JCR *jcr, int retry_interval, int max_retry_time, void get_level_since_time(JCR *jcr, char *since, int since_len) { int JobLevel; - /* Lookup the last FULL backup job to get the time/date for a - * differential or incremental save. - */ + + since[0] = 0; + if (jcr->cloned) { + if (jcr->stime && jcr->stime[0]) { + bstrncpy(since, _(", since="), since_len); + bstrncat(since, jcr->stime, since_len); + } + return; + } if (!jcr->stime) { jcr->stime = get_pool_memory(PM_MESSAGE); - } + } jcr->stime[0] = 0; - since[0] = 0; + /* Lookup the last FULL backup job to get the time/date for a + * differential or incremental save. + */ switch (jcr->JobLevel) { case L_DIFFERENTIAL: case L_INCREMENTAL: /* Look up start time of last job */ jcr->jr.JobId = 0; /* flag for db_find_job_start time */ if (!db_find_job_start_time(jcr, jcr->db, &jcr->jr, &jcr->stime)) { - /* No job found, so upgrade this one to Full */ + /* No job found, so upgrade this one to Full */ Jmsg(jcr, M_INFO, 0, "%s", db_strerror(jcr->db)); - Jmsg(jcr, M_INFO, 0, _("No prior or suitable Full backup found. Doing FULL backup.\n")); - bsnprintf(since, since_len, " (upgraded from %s)", - level_to_str(jcr->JobLevel)); - jcr->JobLevel = jcr->jr.JobLevel = L_FULL; + Jmsg(jcr, M_INFO, 0, _("No prior or suitable Full backup found in catalog. Doing FULL backup.\n")); + bsnprintf(since, since_len, _(" (upgraded from %s)"), + level_to_str(jcr->JobLevel)); + jcr->JobLevel = jcr->jr.JobLevel = L_FULL; } else { - if (jcr->job->rerun_failed_levels) { - if (db_find_failed_job_since(jcr, jcr->db, &jcr->jr, jcr->stime, JobLevel)) { - Jmsg(jcr, M_INFO, 0, _("Prior failed job found. Upgrading to %s.\n"), - level_to_str(JobLevel)); - bsnprintf(since, since_len, " (upgraded from %s)", - level_to_str(jcr->JobLevel)); - jcr->JobLevel = jcr->jr.JobLevel = JobLevel; - jcr->jr.JobId = jcr->JobId; - break; - } - } - bstrncpy(since, ", since=", since_len); - bstrncat(since, jcr->stime, since_len); + if (jcr->job->rerun_failed_levels) { + if (db_find_failed_job_since(jcr, jcr->db, &jcr->jr, jcr->stime, JobLevel)) { + Jmsg(jcr, M_INFO, 0, _("Prior failed job found in catalog. Upgrading to %s.\n"), + level_to_str(JobLevel)); + bsnprintf(since, since_len, _(" (upgraded from %s)"), + level_to_str(jcr->JobLevel)); + jcr->JobLevel = jcr->jr.JobLevel = JobLevel; + jcr->jr.JobId = jcr->JobId; + break; + } + } + bstrncpy(since, _(", since="), since_len); + bstrncat(since, jcr->stime, since_len); } jcr->jr.JobId = jcr->JobId; break; @@ -193,7 +205,7 @@ static void send_since_time(JCR *jcr) 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); } @@ -204,7 +216,7 @@ static void send_since_time(JCR *jcr) * Send level command to FD. * Used for backup jobs and estimate command. */ -int send_level_command(JCR *jcr) +bool send_level_command(JCR *jcr) { BSOCK *fd = jcr->file_bsock; /* @@ -230,7 +242,7 @@ int send_level_command(JCR *jcr) case L_SINCE: default: Jmsg2(jcr, M_FATAL, 0, _("Unimplemented backup level %d %c\n"), - jcr->JobLevel, jcr->JobLevel); + jcr->JobLevel, jcr->JobLevel); return 0; } Dmsg1(120, ">filed: %s", fd->msg); @@ -240,143 +252,10 @@ int send_level_command(JCR *jcr) return 1; } - -/* - * Send either an Included or an Excluded list to FD - */ -static int send_list(JCR *jcr, int list) -{ - FILESET *fileset; - BSOCK *fd; - int num; - - fd = jcr->file_bsock; - fileset = jcr->fileset; - - if (list == INC_LIST) { - num = fileset->num_includes; - } else { - num = fileset->num_excludes; - } - - for (int i=0; iinclude_items[i]; - } else { - ie = fileset->exclude_items[i]; - } - for (int j=0; jname_list.size(); j++) { - p = (char *)ie->name_list.get(j); - switch (*p) { - case '|': - p++; /* skip over the | */ - fd->msg = edit_job_codes(jcr, fd->msg, p, ""); - bpipe = open_bpipe(fd->msg, 0, "r"); - if (!bpipe) { - berrno be; - Jmsg(jcr, M_FATAL, 0, _("Cannot run program: %s. ERR=%s\n"), - p, be.strerror()); - goto bail_out; - } - /* Copy File options */ - if (ie->num_opts) { - bstrncpy(buf, ie->opts_list[0]->opts, sizeof(buf)); - bstrncat(buf, " ", sizeof(buf)); - } else { - bstrncpy(buf, "0 ", sizeof(buf)); - } - Dmsg1(500, "Opts=%s\n", buf); - optlen = strlen(buf); - while (fgets(buf+optlen, sizeof(buf)-optlen, bpipe->rfd)) { - fd->msglen = Mmsg(fd->msg, "%s", buf); - Dmsg2(500, "Inc/exc len=%d: %s", fd->msglen, fd->msg); - if (!bnet_send(fd)) { - Jmsg(jcr, M_FATAL, 0, _(">filed: write error on socket\n")); - goto bail_out; - } - } - if ((stat=close_bpipe(bpipe)) != 0) { - berrno be; - Jmsg(jcr, M_FATAL, 0, _("Error running program %p: ERR=%s\n"), - p, be.strerror(stat)); - goto bail_out; - } - break; - case '<': - p++; /* skip over < */ - if ((ffd = fopen(p, "r")) == NULL) { - Jmsg(jcr, M_FATAL, 0, _("Cannot open %s file: %s. ERR=%s\n"), - list==INC_LIST?"included":"excluded", p, strerror(errno)); - goto bail_out; - } - /* Copy File options */ - if (ie->num_opts) { - bstrncpy(buf, ie->opts_list[0]->opts, sizeof(buf)); - bstrncat(buf, " ", sizeof(buf)); - } else { - bstrncpy(buf, "0 ", sizeof(buf)); - } - Dmsg1(500, "Opts=%s\n", buf); - optlen = strlen(buf); - while (fgets(buf+optlen, sizeof(buf)-optlen, ffd)) { - fd->msglen = Mmsg(fd->msg, "%s", buf); - if (!bnet_send(fd)) { - Jmsg(jcr, M_FATAL, 0, _(">filed: write error on socket\n")); - goto bail_out; - } - } - fclose(ffd); - break; - case '\\': - p++; /* skip over \ */ - /* Note, fall through wanted */ - default: - if (ie->num_opts) { - Dmsg2(500, "numopts=%d opts=%s\n", ie->num_opts, NPRT(ie->opts_list[0]->opts)); - pm_strcpy(fd->msg, ie->opts_list[0]->opts); - pm_strcat(fd->msg, " "); - } else { - pm_strcpy(fd->msg, "0 "); - } - fd->msglen = pm_strcat(fd->msg, p); - Dmsg1(500, "Inc/Exc name=%s\n", fd->msg); - if (!bnet_send(fd)) { - Jmsg(jcr, M_FATAL, 0, _(">filed: write error on socket\n")); - goto bail_out; - } - break; - } - } - } - bnet_sig(fd, BNET_EOD); /* end of data */ - if (list == INC_LIST) { - if (!response(jcr, fd, OKinc, "Include", DISPLAY_ERROR)) { - goto bail_out; - } - } else if (!response(jcr, fd, OKexc, "Exclude", DISPLAY_ERROR)) { - goto bail_out; - } - return 1; - -bail_out: - set_jcr_job_status(jcr, JS_ErrorTerminated); - return 0; - -} - - /* * 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; @@ -385,144 +264,159 @@ static int send_fileset(JCR *jcr) for ( ;; ) { if (include) { - num = fileset->num_includes; + num = fileset->num_includes; } else { - num = fileset->num_excludes; + num = fileset->num_excludes; } for (int i=0; iinclude_items[i]; + BPIPE *bpipe; + FILE *ffd; + char buf[2000]; + char *p; + int optlen, stat; + INCEXE *ie; + int j, k; + + if (include) { + ie = fileset->include_items[i]; bnet_fsend(fd, "I\n"); - } else { - ie = fileset->exclude_items[i]; + } else { + ie = fileset->exclude_items[i]; bnet_fsend(fd, "E\n"); - } - for (j=0; jnum_opts; j++) { - FOPTS *fo = ie->opts_list[j]; + } + for (j=0; jnum_opts; j++) { + FOPTS *fo = ie->opts_list[j]; bnet_fsend(fd, "O %s\n", fo->opts); - for (k=0; kregex.size(); k++) { + + bool enhanced_wild = false; + for (k=0; fo->opts[k]!='\0'; k++) { + if (fo->opts[k]=='W') { + enhanced_wild = true; + break; + } + } + + for (k=0; kregex.size(); k++) { bnet_fsend(fd, "R %s\n", fo->regex.get(k)); - } - for (k=0; kregexdir.size(); k++) { + } + for (k=0; kregexdir.size(); k++) { bnet_fsend(fd, "RD %s\n", fo->regexdir.get(k)); - } - for (k=0; kregexfile.size(); k++) { + } + for (k=0; kregexfile.size(); k++) { bnet_fsend(fd, "RF %s\n", fo->regexfile.get(k)); - } - for (k=0; kwild.size(); k++) { + } + for (k=0; kwild.size(); k++) { bnet_fsend(fd, "W %s\n", fo->wild.get(k)); - } - for (k=0; kwilddir.size(); k++) { + } + for (k=0; kwilddir.size(); k++) { bnet_fsend(fd, "WD %s\n", fo->wilddir.get(k)); - } - for (k=0; kwildfile.size(); k++) { + } + for (k=0; kwildfile.size(); k++) { bnet_fsend(fd, "WF %s\n", fo->wildfile.get(k)); - } - for (k=0; kbase.size(); k++) { + } + for (k=0; kwildbase.size(); k++) { + bnet_fsend(fd, "W%c %s\n", enhanced_wild ? 'B' : 'F', fo->wildbase.get(k)); + } + for (k=0; kbase.size(); k++) { bnet_fsend(fd, "B %s\n", fo->base.get(k)); - } - for (k=0; kfstype.size(); k++) { + } + for (k=0; kfstype.size(); k++) { bnet_fsend(fd, "X %s\n", fo->fstype.get(k)); - } - if (fo->reader) { + } + for (k=0; kdrivetype.size(); k++) { + bnet_fsend(fd, "XD %s\n", fo->drivetype.get(k)); + } + if (fo->reader) { bnet_fsend(fd, "D %s\n", fo->reader); - } - if (fo->writer) { + } + if (fo->writer) { bnet_fsend(fd, "T %s\n", fo->writer); - } + } bnet_fsend(fd, "N\n"); - } + } - for (j=0; jname_list.size(); j++) { - p = (char *)ie->name_list.get(j); - switch (*p) { + for (j=0; jname_list.size(); j++) { + p = (char *)ie->name_list.get(j); + switch (*p) { case '|': - p++; /* skip over the | */ + p++; /* skip over the | */ fd->msg = edit_job_codes(jcr, fd->msg, p, ""); bpipe = open_bpipe(fd->msg, 0, "r"); - if (!bpipe) { - berrno be; + if (!bpipe) { + berrno be; Jmsg(jcr, M_FATAL, 0, _("Cannot run program: %s. ERR=%s\n"), - p, be.strerror()); - goto bail_out; - } + p, be.strerror()); + goto bail_out; + } bstrncpy(buf, "F ", sizeof(buf)); Dmsg1(500, "Opts=%s\n", buf); - optlen = strlen(buf); - while (fgets(buf+optlen, sizeof(buf)-optlen, bpipe->rfd)) { + optlen = strlen(buf); + while (fgets(buf+optlen, sizeof(buf)-optlen, bpipe->rfd)) { fd->msglen = Mmsg(fd->msg, "%s", buf); Dmsg2(500, "Inc/exc len=%d: %s", fd->msglen, fd->msg); - if (!bnet_send(fd)) { + if (!bnet_send(fd)) { Jmsg(jcr, M_FATAL, 0, _(">filed: write error on socket\n")); - goto bail_out; - } - } - if ((stat=close_bpipe(bpipe)) != 0) { - berrno be; + goto bail_out; + } + } + if ((stat=close_bpipe(bpipe)) != 0) { + berrno be; Jmsg(jcr, M_FATAL, 0, _("Error running program: %s. ERR=%s\n"), - p, be.strerror(stat)); - goto bail_out; - } - break; + p, be.strerror(stat)); + goto bail_out; + } + break; case '<': - p++; /* skip over < */ - if ((ffd = fopen(p, "r")) == NULL) { - berrno be; + p++; /* skip over < */ + if ((ffd = fopen(p, "rb")) == NULL) { + berrno be; Jmsg(jcr, M_FATAL, 0, _("Cannot open included file: %s. ERR=%s\n"), - p, be.strerror()); - goto bail_out; - } + p, be.strerror()); + goto bail_out; + } bstrncpy(buf, "F ", sizeof(buf)); Dmsg1(500, "Opts=%s\n", buf); - optlen = strlen(buf); - while (fgets(buf+optlen, sizeof(buf)-optlen, ffd)) { + optlen = strlen(buf); + while (fgets(buf+optlen, sizeof(buf)-optlen, ffd)) { fd->msglen = Mmsg(fd->msg, "%s", buf); - if (!bnet_send(fd)) { + if (!bnet_send(fd)) { Jmsg(jcr, M_FATAL, 0, _(">filed: write error on socket\n")); - goto bail_out; - } - } - fclose(ffd); - break; + goto bail_out; + } + } + fclose(ffd); + break; case '\\': p++; /* skip over \ */ - /* Note, fall through wanted */ - default: + /* Note, fall through wanted */ + default: pm_strcpy(fd->msg, "F "); - fd->msglen = pm_strcat(fd->msg, p); + fd->msglen = pm_strcat(fd->msg, p); Dmsg1(500, "Inc/Exc name=%s\n", fd->msg); - if (!bnet_send(fd)) { + if (!bnet_send(fd)) { Jmsg(jcr, M_FATAL, 0, _(">filed: write error on socket\n")); - goto bail_out; - } - break; - } - } + goto bail_out; + } + break; + } + } bnet_fsend(fd, "N\n"); } - if (!include) { /* If we just did excludes */ - break; /* all done */ + if (!include) { /* If we just did excludes */ + break; /* all done */ } - include = false; /* Now do excludes */ + include = false; /* Now do excludes */ } - bnet_sig(fd, BNET_EOD); /* end of data */ + bnet_sig(fd, BNET_EOD); /* end of data */ 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; } @@ -530,97 +424,158 @@ bail_out: /* * Send include list to File daemon */ -int send_include_list(JCR *jcr) +bool send_include_list(JCR *jcr) { BSOCK *fd = jcr->file_bsock; if (jcr->fileset->new_include) { - bnet_fsend(fd, fileset); + bnet_fsend(fd, filesetcmd, jcr->fileset->enable_vss ? " vss=1" : ""); return send_fileset(jcr); - } else { - bnet_fsend(fd, inc); } - return send_list(jcr, INC_LIST); + return true; } /* * Send exclude list to File daemon + * Under the new scheme, the Exclude list + * is part of the FileSet sent with the + * "include_list" above. */ -int send_exclude_list(JCR *jcr) +bool send_exclude_list(JCR *jcr) { - BSOCK *fd = jcr->file_bsock; - if (jcr->fileset->new_include) { - return 1; - } - bnet_fsend(fd, exc); - return send_list(jcr, EXC_LIST); + return true; } /* - * 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. */ -int 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"); + 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.strerror()); + 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 (!response(jcr, fd, OKbootstrap, "Bootstrap", DISPLAY_ERROR)) { - set_jcr_job_status(jcr, JS_ErrorTerminated); - return 0; - } - return 1; + if (jcr->unlink_bsr) { + unlink(jcr->RestoreBootstrap); + jcr->unlink_bsr = false; + } + return true; } +/* TODO: drop this with runscript.old_proto in bacula 1.42 */ +static char runbefore[] = "RunBeforeJob %s\n"; +static char runafter[] = "RunAfterJob %s\n"; +static char OKRunBefore[] = "2000 OK RunBefore\n"; +static char OKRunAfter[] = "2000 OK RunAfter\n"; + +int send_runscript_with_old_proto(JCR *jcr, int when, POOLMEM *msg) +{ + int ret; + Dmsg1(120, "bdird: sending old runcommand to fd '%s'\n",msg); + if (when & SCRIPT_Before) { + bnet_fsend(jcr->file_bsock, runbefore, msg); + ret = response(jcr, jcr->file_bsock, OKRunBefore, "ClientRunBeforeJob", DISPLAY_ERROR); + } else { + bnet_fsend(jcr->file_bsock, runafter, msg); + ret = response(jcr, jcr->file_bsock, OKRunAfter, "ClientRunAfterJob", DISPLAY_ERROR); + } + return ret; +} /* END OF TODO */ + /* - * Send ClientRunBeforeJob and ClientRunAfterJob to File daemon + * Send RunScripts to File daemon + * 1) We send all runscript to FD, they can be executed Before, After, or twice + * 2) Then, we send a "RunBeforeNow" command to the FD to tell him to do the + * first run_script() call. (ie ClientRunBeforeJob) */ -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; - } - } - 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; + RUNSCRIPT *cmd; + bool launch_before_cmd = false; + POOLMEM *ehost = get_pool_memory(PM_FNAME); + int result; + + 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); + + Dmsg1(120, "bdird: sending runscripts to fd '%s'\n", cmd->command); + + /* TODO: remove this with bacula 1.42 */ + if (cmd->old_proto) { + result = send_runscript_with_old_proto(jcr, cmd->when, msg); + + } else { + bnet_fsend(fd, runscript, cmd->on_success, + cmd->on_failure, + cmd->abort_on_error, + cmd->when, + msg); + + result = response(jcr, fd, OKRunScript, "RunScript", DISPLAY_ERROR); + launch_before_cmd=true; + } + + if (!result) { + set_jcr_job_status(jcr, JS_ErrorTerminated); + free_pool_memory(msg); + free_pool_memory(ehost); + return 0; + } + } + /* TODO : we have to play with other client */ + /* + else { + send command to an other client + } + */ + } + } + + /* We tell to the FD that i can execute commands (ie ClientRunBeforeJob) */ + 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; } @@ -641,7 +596,7 @@ int get_attributes_and_put_in_catalog(JCR *jcr) 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 @@ -651,73 +606,75 @@ int get_attributes_and_put_in_catalog(JCR *jcr) 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, _("msglen, fd->msg); - set_jcr_job_status(jcr, JS_ErrorTerminated); - return 0; + set_jcr_job_status(jcr, JS_ErrorTerminated); + return 0; } p = fd->msg; - skip_nonspaces(&p); /* skip FileIndex */ + skip_nonspaces(&p); /* skip FileIndex */ skip_spaces(&p); - skip_nonspaces(&p); /* skip Stream */ + skip_nonspaces(&p); /* skip Stream */ skip_spaces(&p); - skip_nonspaces(&p); /* skip Opts_SHA1 */ - p++; /* skip space */ + skip_nonspaces(&p); /* skip Opts_SHA1 */ + p++; /* skip space */ fn = jcr->fname; while (*p != 0) { - *fn++ = *p++; /* copy filename */ + *fn++ = *p++; /* copy filename */ } - *fn = *p++; /* term filename and point to attribs */ + *fn = *p++; /* term filename and point to attribs */ attr = p; if (stream == STREAM_UNIX_ATTRIBUTES || stream == STREAM_UNIX_ATTRIBUTES_EX) { - jcr->JobFiles++; - jcr->FileIndex = file_index; - ar.attr = attr; - ar.fname = jcr->fname; - ar.FileIndex = file_index; - ar.Stream = stream; - ar.link = NULL; - ar.JobId = jcr->JobId; - ar.ClientId = jcr->ClientId; - ar.PathId = 0; - ar.FilenameId = 0; + jcr->JobFiles++; + jcr->FileIndex = file_index; + ar.attr = attr; + ar.fname = jcr->fname; + ar.FileIndex = file_index; + ar.Stream = stream; + ar.link = NULL; + ar.JobId = jcr->JobId; + ar.ClientId = jcr->ClientId; + ar.PathId = 0; + ar.FilenameId = 0; + ar.Digest = NULL; + ar.DigestType = CRYPTO_DIGEST_NONE; Dmsg2(111, "dirdfname); Dmsg1(120, "dirddb, &ar)) { + if (!db_create_file_attributes_record(jcr, jcr->db, &ar)) { Jmsg1(jcr, M_ERROR, 0, "%s", db_strerror(jcr->db)); - set_jcr_job_status(jcr, JS_Error); - continue; - } - jcr->FileId = ar.FileId; - } else if (stream == STREAM_MD5_SIGNATURE || stream == STREAM_SHA1_SIGNATURE) { - 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); - 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)) { + set_jcr_job_status(jcr, JS_Error); + continue; + } + jcr->FileId = ar.FileId; + } else if (crypto_digest_stream_type(stream) != CRYPTO_DIGEST_NONE) { + if (jcr->FileIndex != (uint32_t)file_index) { + 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(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); - } + set_jcr_job_status(jcr, JS_Error); + } } jcr->jr.JobFiles = jcr->JobFiles = file_index; jcr->jr.LastIndex = file_index; } if (is_bnet_error(fd)) { Jmsg1(jcr, M_FATAL, 0, _("