X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Ffiled%2Fjob.c;h=9e1f8d2de4f9027db78c1577a9cdf5ed2837a1c0;hb=334b701e895a6ec517b26d05cf1266c25d518025;hp=8b055faa225229b15b242c039140b1822b606d5d;hpb=5d7966e6cf6d56bc47bb9bd15a3ac846e4230dc6;p=bacula%2Fbacula diff --git a/bacula/src/filed/job.c b/bacula/src/filed/job.c index 8b055faa22..9e1f8d2de4 100644 --- a/bacula/src/filed/job.c +++ b/bacula/src/filed/job.c @@ -1,40 +1,55 @@ /* - * Bacula File Daemon Job processing - * - * Kern Sibbald, October MM - * - * Version $Id$ - * - */ -/* - Copyright (C) 2000-2005 Kern Sibbald + Bacula® - The Network Backup Solution + + Copyright (C) 2000-2008 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 two of the GNU 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 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 File Daemon Job processing + * + * Kern Sibbald, October MM + * + * Version $Id$ + * */ #include "bacula.h" #include "filed.h" -extern char my_name[]; -extern CLIENT *me; /* our client resource */ +#if defined(WIN32_VSS) +#include "vss.h" + +static pthread_mutex_t vss_mutex = PTHREAD_MUTEX_INITIALIZER; +static int enable_vss; +#endif + +extern CLIENT *me; /* our client resource */ /* Imported functions */ extern int status_cmd(JCR *jcr); extern int qstatus_cmd(JCR *jcr); +extern int accurate_cmd(JCR *jcr); /* Forward referenced functions */ static int backup_cmd(JCR *jcr); @@ -42,10 +57,8 @@ static int bootstrap_cmd(JCR *jcr); static int cancel_cmd(JCR *jcr); static int setdebug_cmd(JCR *jcr); static int estimate_cmd(JCR *jcr); -static int exclude_cmd(JCR *jcr); static int hello_cmd(JCR *jcr); static int job_cmd(JCR *jcr); -static int include_cmd(JCR *jcr); static int fileset_cmd(JCR *jcr); static int level_cmd(JCR *jcr); static int verify_cmd(JCR *jcr); @@ -56,9 +69,10 @@ static int response(JCR *jcr, BSOCK *sd, char *resp, const char *cmd); static void filed_free_jcr(JCR *jcr); static int open_sd_read_session(JCR *jcr); static int send_bootstrap_file(JCR *jcr); +static int runscript_cmd(JCR *jcr); static int runbefore_cmd(JCR *jcr); static int runafter_cmd(JCR *jcr); -static bool run_cmd(JCR *jcr, char *cmd, const char *name); +static int runbeforenow_cmd(JCR *jcr); static void set_options(findFOPTS *fo, const char *opts); @@ -78,9 +92,7 @@ static struct s_cmds cmds[] = { {"cancel", cancel_cmd, 0}, {"setdebug=", setdebug_cmd, 0}, {"estimate", estimate_cmd, 0}, - {"exclude", exclude_cmd, 0}, {"Hello", hello_cmd, 1}, - {"include", include_cmd, 0}, {"fileset", fileset_cmd, 0}, {"JobId=", job_cmd, 0}, {"level = ", level_cmd, 0}, @@ -91,29 +103,33 @@ static struct s_cmds cmds[] = { {"storage ", storage_cmd, 0}, {"verify", verify_cmd, 0}, {"bootstrap", bootstrap_cmd, 0}, + {"RunBeforeNow", runbeforenow_cmd, 0}, {"RunBeforeJob", runbefore_cmd, 0}, {"RunAfterJob", runafter_cmd, 0}, - {NULL, NULL} /* list terminator */ + {"Run", runscript_cmd, 0}, + {"accurate", accurate_cmd, 0}, + {NULL, NULL} /* list terminator */ }; /* Commands received from director that need scanning */ static char jobcmd[] = "JobId=%d Job=%127s SDid=%d SDtime=%d Authorization=%100s"; -static char storaddr[] = "storage address=%s port=%d ssl=%d\n"; +static char storaddr[] = "storage address=%s port=%d ssl=%d"; static char sessioncmd[] = "session %127s %ld %ld %ld %ld %ld %ld\n"; static char restorecmd[] = "restore replace=%c prelinks=%d where=%s\n"; static char restorecmd1[] = "restore replace=%c prelinks=%d where=\n"; -static char verifycmd[] = "verify level=%30s\n"; -static char estimatecmd[] = "estimate listing=%d\n"; -static char runbefore[] = "RunBeforeJob %s\n"; -static char runafter[] = "RunAfterJob %s\n"; +static char restorecmdR[] = "restore replace=%c prelinks=%d regexwhere=%s\n"; +static char verifycmd[] = "verify level=%30s"; +static char estimatecmd[] = "estimate listing=%d"; +static char runbefore[] = "RunBeforeJob %s"; +static char runafter[] = "RunAfterJob %s"; +static char runscript[] = "Run OnSuccess=%d OnFailure=%d AbortOnError=%d When=%d Command=%s"; /* Responses sent to Director */ static char errmsg[] = "2999 Invalid command\n"; static char no_auth[] = "2998 No Authorization\n"; -static char illegal_cmd[] = "2997 Illegal command for a Director with Monitor directive enabled\n"; +static char invalid_cmd[] = "2997 Invalid command for a Director with Monitor directive enabled.\n"; static char OKinc[] = "2000 OK include\n"; static char OKest[] = "2000 OK estimate files=%u bytes=%s\n"; -static char OKexc[] = "2000 OK exclude\n"; static char OKlevel[] = "2000 OK level\n"; static char OKbackup[] = "2000 OK backup\n"; static char OKbootstrap[] = "2000 OK bootstrap\n"; @@ -121,12 +137,16 @@ static char OKverify[] = "2000 OK verify\n"; static char OKrestore[] = "2000 OK restore\n"; static char OKsession[] = "2000 OK session\n"; static char OKstore[] = "2000 OK storage\n"; -static char OKjob[] = "2000 OK Job %s,%s,%s"; +static char OKjob[] = "2000 OK Job %s (%s) %s,%s,%s"; static char OKsetdebug[] = "2000 OK setdebug=%d\n"; static char BADjob[] = "2901 Bad Job\n"; -static char EndJob[] = "2800 End Job TermCode=%d JobFiles=%u ReadBytes=%s JobBytes=%s Errors=%u\n"; +static char EndJob[] = "2800 End Job TermCode=%d JobFiles=%u ReadBytes=%s" + " JobBytes=%s Errors=%u VSS=%d Encrypt=%d\n"; static char OKRunBefore[] = "2000 OK RunBefore\n"; +static char OKRunBeforeNow[] = "2000 OK RunBeforeNow\n"; static char OKRunAfter[] = "2000 OK RunAfter\n"; +static char OKRunScript[] = "2000 OK RunScript\n"; + /* Responses received from Storage Daemon */ static char OK_end[] = "3000 OK end\n"; @@ -134,7 +154,7 @@ static char OK_close[] = "3000 OK close Status = %d\n"; static char OK_open[] = "3000 OK open ticket = %d\n"; static char OK_data[] = "3000 OK data\n"; static char OK_append[] = "3000 OK append data\n"; -static char OKSDbootstrap[] = "3000 OK bootstrap\n"; +static char OKSDbootstrap[]= "3000 OK bootstrap\n"; /* Commands sent to Storage Daemon */ @@ -162,7 +182,23 @@ static char read_close[] = "read close session %d\n"; * Accept commands one at a time from the Director * and execute them. * + * Concerning ClientRunBefore/After, the sequence of events + * is rather critical. If they are not done in the right + * order one can easily get FD->SD timeouts if the script + * runs a long time. + * + * The current sequence of events is: + * 1. Dir starts job with FD + * 2. Dir connects to SD + * 3. Dir connects to FD + * 4. FD connects to SD + * 5. FD gets/runs ClientRunBeforeJob and sends ClientRunAfterJob + * 6. Dir sends include/exclude + * 7. FD sends data to SD + * 8. SD/FD disconnects while SD despools data and attributes (optionnal) + * 9. FD runs ClientRunAfterJob */ + void *handle_client_request(void *dirp) { int i; @@ -174,11 +210,18 @@ void *handle_client_request(void *dirp) jcr->dir_bsock = dir; jcr->ff = init_find_files(); jcr->start_time = time(NULL); + jcr->RunScripts = New(alist(10, not_owned_by_alist)); jcr->last_fname = get_pool_memory(PM_FNAME); jcr->last_fname[0] = 0; jcr->client_name = get_memory(strlen(my_name) + 1); + new_plugins(jcr); /* instantiate plugins for this jcr */ pm_strcpy(jcr->client_name, my_name); - dir->jcr = jcr; + jcr->crypto.pki_sign = me->pki_sign; + jcr->crypto.pki_encrypt = me->pki_encrypt; + jcr->crypto.pki_keypair = me->pki_keypair; + jcr->crypto.pki_signers = me->pki_signers; + jcr->crypto.pki_recipients = me->pki_recipients; + dir->set_jcr(jcr); enable_backup_privileges(NULL, 1 /* ignore_errors */); /**********FIXME******* add command handler error code */ @@ -187,37 +230,37 @@ void *handle_client_request(void *dirp) /* Read command */ if (bnet_recv(dir) < 0) { - break; /* connection terminated */ + break; /* connection terminated */ } dir->msg[dir->msglen] = 0; Dmsg1(100, "msg); found = false; for (i=0; cmds[i].cmd; i++) { - if (strncmp(cmds[i].cmd, dir->msg, strlen(cmds[i].cmd)) == 0) { - found = true; /* indicate command found */ - if (!jcr->authenticated && cmds[i].func != hello_cmd) { - bnet_fsend(dir, no_auth); - bnet_sig(dir, BNET_EOD); - break; - } - if ((jcr->authenticated) && (!cmds[i].monitoraccess) && (jcr->director->monitor)) { - Dmsg1(100, "Command %s illegal.\n", cmds[i].cmd); - bnet_fsend(dir, illegal_cmd); - bnet_sig(dir, BNET_EOD); - break; - } + if (strncmp(cmds[i].cmd, dir->msg, strlen(cmds[i].cmd)) == 0) { + found = true; /* indicate command found */ + if (!jcr->authenticated && cmds[i].func != hello_cmd) { + bnet_fsend(dir, no_auth); + bnet_sig(dir, BNET_EOD); + break; + } + if ((jcr->authenticated) && (!cmds[i].monitoraccess) && (jcr->director->monitor)) { + Dmsg1(100, "Command \"%s\" is invalid.\n", cmds[i].cmd); + bnet_fsend(dir, invalid_cmd); + bnet_sig(dir, BNET_EOD); + break; + } Dmsg1(100, "Executing %s command.\n", cmds[i].cmd); - if (!cmds[i].func(jcr)) { /* do command */ - quit = true; /* error or fully terminated, get out */ - Dmsg0(20, "Quit command loop due to command error or Job done.\n"); - } - break; - } + if (!cmds[i].func(jcr)) { /* do command */ + quit = true; /* error or fully terminated, get out */ + Dmsg1(20, "Quit command loop. Canceled=%d\n", job_canceled(jcr)); + } + break; + } } - if (!found) { /* command not found */ - bnet_fsend(dir, errmsg); - quit = true; - break; + if (!found) { /* command not found */ + bnet_fsend(dir, errmsg); + quit = true; + break; } } @@ -226,72 +269,90 @@ void *handle_client_request(void *dirp) bnet_sig(jcr->store_bsock, BNET_TERMINATE); } - if (jcr->RunAfterJob && !job_canceled(jcr)) { - run_cmd(jcr, jcr->RunAfterJob, "ClientRunAfterJob"); + /* Run the after job */ + run_scripts(jcr, jcr->RunScripts, "ClientAfterJob"); + + if (jcr->JobId) { /* send EndJob if running a job */ + char ed1[50], ed2[50]; + /* Send termination status back to Dir */ + bnet_fsend(dir, EndJob, jcr->JobStatus, jcr->JobFiles, + edit_uint64(jcr->ReadBytes, ed1), + edit_uint64(jcr->JobBytes, ed2), jcr->Errors, jcr->VSS, + jcr->crypto.pki_encrypt); + Dmsg1(110, "End FD msg: %s\n", dir->msg); } - dequeue_messages(jcr); /* send any queued messages */ + + generate_daemon_event(jcr, "JobEnd"); + generate_plugin_event(jcr, bEventJobEnd); + + dequeue_messages(jcr); /* send any queued messages */ /* Inform Director that we are done */ - bnet_sig(dir, BNET_TERMINATE); + dir->signal(BNET_TERMINATE); + + free_plugins(jcr); /* release instantiated plugins */ /* Clean up fileset */ - FF_PKT *ff = (FF_PKT *)jcr->ff; + FF_PKT *ff = jcr->ff; findFILESET *fileset = ff->fileset; if (fileset) { int i, j, k; /* Delete FileSet Include lists */ for (i=0; iinclude_list.size(); i++) { - findINCEXE *incexe = (findINCEXE *)fileset->include_list.get(i); - for (j=0; jopts_list.size(); j++) { - findFOPTS *fo = (findFOPTS *)incexe->opts_list.get(j); - for (k=0; kregex.size(); k++) { - regfree((regex_t *)fo->regex.get(k)); - } - fo->regex.destroy(); - fo->regexdir.destroy(); - fo->regexfile.destroy(); - fo->wild.destroy(); - fo->wilddir.destroy(); - fo->wildfile.destroy(); - fo->base.destroy(); - fo->fstype.destroy(); - if (fo->reader) { - free(fo->reader); - } - if (fo->writer) { - free(fo->writer); - } - } - incexe->opts_list.destroy(); - incexe->name_list.destroy(); + findINCEXE *incexe = (findINCEXE *)fileset->include_list.get(i); + for (j=0; jopts_list.size(); j++) { + findFOPTS *fo = (findFOPTS *)incexe->opts_list.get(j); + for (k=0; kregex.size(); k++) { + regfree((regex_t *)fo->regex.get(k)); + } + fo->regex.destroy(); + fo->regexdir.destroy(); + fo->regexfile.destroy(); + fo->wild.destroy(); + fo->wilddir.destroy(); + fo->wildfile.destroy(); + fo->wildbase.destroy(); + fo->base.destroy(); + fo->fstype.destroy(); + fo->drivetype.destroy(); + } + incexe->opts_list.destroy(); + incexe->name_list.destroy(); + incexe->plugin_list.destroy(); } fileset->include_list.destroy(); /* Delete FileSet Exclude lists */ for (i=0; iexclude_list.size(); i++) { - findINCEXE *incexe = (findINCEXE *)fileset->exclude_list.get(i); - for (j=0; jopts_list.size(); j++) { - findFOPTS *fo = (findFOPTS *)incexe->opts_list.get(j); - fo->regex.destroy(); - fo->regexdir.destroy(); - fo->regexfile.destroy(); - fo->wild.destroy(); - fo->wilddir.destroy(); - fo->wildfile.destroy(); - fo->base.destroy(); - fo->fstype.destroy(); - } - incexe->opts_list.destroy(); - incexe->name_list.destroy(); + findINCEXE *incexe = (findINCEXE *)fileset->exclude_list.get(i); + for (j=0; jopts_list.size(); j++) { + findFOPTS *fo = (findFOPTS *)incexe->opts_list.get(j); + fo->regex.destroy(); + fo->regexdir.destroy(); + fo->regexfile.destroy(); + fo->wild.destroy(); + fo->wilddir.destroy(); + fo->wildfile.destroy(); + fo->wildbase.destroy(); + fo->base.destroy(); + fo->fstype.destroy(); + fo->drivetype.destroy(); + } + incexe->opts_list.destroy(); + incexe->name_list.destroy(); + incexe->plugin_list.destroy(); } fileset->exclude_list.destroy(); free(fileset); } + ff->fileset = NULL; Dmsg0(100, "Calling term_find_files\n"); - term_find_files((FF_PKT *)jcr->ff); + term_find_files(jcr->ff); + jcr->ff = NULL; Dmsg0(100, "Done with term_find_files\n"); - free_jcr(jcr); /* destroy JCR record */ + free_jcr(jcr); /* destroy JCR record */ Dmsg0(100, "Done with free_jcr\n"); + Dsm_check(1); return NULL; } @@ -321,28 +382,21 @@ static int cancel_cmd(JCR *jcr) if (sscanf(dir->msg, "cancel Job=%127s", Job) == 1) { if (!(cjcr=get_jcr_by_full_name(Job))) { - bnet_fsend(dir, "2901 Job %s not found.\n", Job); + dir->fsend(_("2901 Job %s not found.\n"), Job); } else { - if (cjcr->store_bsock) { - P(cjcr->mutex); - cjcr->store_bsock->timed_out = 1; - cjcr->store_bsock->terminated = 1; -/* - * #if !defined(HAVE_CYGWIN) && !defined(HAVE_WIN32) - */ -#if !defined(HAVE_CYGWIN) - pthread_kill(cjcr->my_thread_id, TIMEOUT_SIGNAL); -#endif - V(cjcr->mutex); - } - set_jcr_job_status(cjcr, JS_Canceled); - free_jcr(cjcr); - bnet_fsend(dir, _("2001 Job %s marked to be canceled.\n"), Job); + if (cjcr->store_bsock) { + cjcr->store_bsock->set_timed_out(); + cjcr->store_bsock->set_terminated(); + pthread_kill(cjcr->my_thread_id, TIMEOUT_SIGNAL); + } + set_jcr_job_status(cjcr, JS_Canceled); + free_jcr(cjcr); + dir->fsend(_("2001 Job %s marked to be canceled.\n"), Job); } } else { - bnet_fsend(dir, _("2902 Error scanning cancel command.\n")); + dir->fsend(_("2902 Error scanning cancel command.\n")); } - bnet_sig(dir, BNET_EOD); + dir->signal(BNET_EOD); return 1; } @@ -359,12 +413,12 @@ static int setdebug_cmd(JCR *jcr) Dmsg1(110, "setdebug_cmd: %s", dir->msg); if (sscanf(dir->msg, "setdebug=%d trace=%d", &level, &trace_flag) != 2 || level < 0) { pm_strcpy(jcr->errmsg, dir->msg); - bnet_fsend(dir, "2991 Bad setdebug command: %s\n", jcr->errmsg); + dir->fsend(_("2991 Bad setdebug command: %s\n"), jcr->errmsg); return 0; } debug_level = level; set_trace(trace_flag); - return bnet_fsend(dir, OKsetdebug, level); + return dir->fsend(OKsetdebug, level); } @@ -376,13 +430,13 @@ static int estimate_cmd(JCR *jcr) if (sscanf(dir->msg, estimatecmd, &jcr->listing) != 1) { pm_strcpy(jcr->errmsg, dir->msg); Jmsg(jcr, M_FATAL, 0, _("Bad estimate command: %s"), jcr->errmsg); - bnet_fsend(dir, "2992 Bad estimate command.\n"); + dir->fsend(_("2992 Bad estimate command.\n")); return 0; } make_estimate(jcr); - bnet_fsend(dir, OKest, jcr->num_files_examined, + dir->fsend(OKest, jcr->num_files_examined, edit_uint64_with_commas(jcr->JobBytes, ed2)); - bnet_sig(dir, BNET_EOD); + dir->signal(BNET_EOD); return 1; } @@ -396,18 +450,20 @@ static int job_cmd(JCR *jcr) sd_auth_key = get_memory(dir->msglen); if (sscanf(dir->msg, jobcmd, &jcr->JobId, jcr->Job, - &jcr->VolSessionId, &jcr->VolSessionTime, - sd_auth_key) != 5) { + &jcr->VolSessionId, &jcr->VolSessionTime, + sd_auth_key) != 5) { pm_strcpy(jcr->errmsg, dir->msg); Jmsg(jcr, M_FATAL, 0, _("Bad Job Command: %s"), jcr->errmsg); - bnet_fsend(dir, BADjob); + dir->fsend(BADjob); free_pool_memory(sd_auth_key); return 0; } jcr->sd_auth_key = bstrdup(sd_auth_key); free_pool_memory(sd_auth_key); Dmsg2(120, "JobId=%d Auth=%s\n", jcr->JobId, jcr->sd_auth_key); - return bnet_fsend(dir, OKjob, HOST_OS, DISTNAME, DISTVER); + Mmsg(jcr->errmsg, "JobId=%d Job=%s", jcr->JobId, jcr->Job); + generate_plugin_event(jcr, bEventJobStart, (void *)jcr->errmsg); + return dir->fsend(OKjob, VERSION, LSMDATE, HOST_OS, DISTNAME, DISTVER); } static int runbefore_cmd(JCR *jcr) @@ -415,200 +471,115 @@ static int runbefore_cmd(JCR *jcr) bool ok; BSOCK *dir = jcr->dir_bsock; POOLMEM *cmd = get_memory(dir->msglen+1); + RUNSCRIPT *script; Dmsg1(100, "runbefore_cmd: %s", dir->msg); if (sscanf(dir->msg, runbefore, cmd) != 1) { pm_strcpy(jcr->errmsg, dir->msg); Jmsg1(jcr, M_FATAL, 0, _("Bad RunBeforeJob command: %s\n"), jcr->errmsg); - bnet_fsend(dir, "2905 Bad RunBeforeJob command.\n"); + dir->fsend(_("2905 Bad RunBeforeJob command.\n")); free_memory(cmd); return 0; } unbash_spaces(cmd); /* Run the command now */ - ok = run_cmd(jcr, cmd, "ClientRunBeforeJob"); + script = new_runscript(); + script->set_command(cmd); + script->when = SCRIPT_Before; + ok = script->run(jcr, "ClientRunBeforeJob"); + free_runscript(script); + free_memory(cmd); if (ok) { - bnet_fsend(dir, OKRunBefore); + dir->fsend(OKRunBefore); return 1; } else { - bnet_fsend(dir, "2905 Bad RunBeforeJob command.\n"); + dir->fsend(_("2905 Bad RunBeforeJob command.\n")); return 0; } } +static int runbeforenow_cmd(JCR *jcr) +{ + BSOCK *dir = jcr->dir_bsock; + + run_scripts(jcr, jcr->RunScripts, "ClientBeforeJob"); + if (job_canceled(jcr)) { + dir->fsend(_("2905 Bad RunBeforeNow command.\n")); + Dmsg0(100, "Back from run_scripts ClientBeforeJob now: FAILED\n"); + return 0; + } else { + dir->fsend(OKRunBeforeNow); + Dmsg0(100, "Back from run_scripts ClientBeforeJob now: OK\n"); + return 1; + } +} + static int runafter_cmd(JCR *jcr) { BSOCK *dir = jcr->dir_bsock; POOLMEM *msg = get_memory(dir->msglen+1); + RUNSCRIPT *cmd; Dmsg1(100, "runafter_cmd: %s", dir->msg); if (sscanf(dir->msg, runafter, msg) != 1) { pm_strcpy(jcr->errmsg, dir->msg); Jmsg1(jcr, M_FATAL, 0, _("Bad RunAfter command: %s\n"), jcr->errmsg); - bnet_fsend(dir, "2905 Bad RunAfterJob command.\n"); + dir->fsend(_("2905 Bad RunAfterJob command.\n")); free_memory(msg); return 0; } unbash_spaces(msg); - if (jcr->RunAfterJob) { - free_pool_memory(jcr->RunAfterJob); - } - jcr->RunAfterJob = get_pool_memory(PM_FNAME); - pm_strcpy(jcr->RunAfterJob, msg); - free_pool_memory(msg); - return bnet_fsend(dir, OKRunAfter); -} -static bool run_cmd(JCR *jcr, char *cmd, const char *name) -{ - POOLMEM *ecmd = get_pool_memory(PM_FNAME); - int status; - BPIPE *bpipe; - char line[MAXSTRING]; - - ecmd = edit_job_codes(jcr, ecmd, cmd, ""); - bpipe = open_bpipe(ecmd, 0, "r"); - free_pool_memory(ecmd); - if (bpipe == NULL) { - berrno be; - Jmsg(jcr, M_FATAL, 0, _("%s could not execute. ERR=%s\n"), name, - be.strerror()); - return false; - } - while (fgets(line, sizeof(line), bpipe->rfd)) { - int len = strlen(line); - if (len > 0 && line[len-1] == '\n') { - line[len-1] = 0; - } - Jmsg(jcr, M_INFO, 0, _("%s: %s\n"), name, line); - } - status = close_bpipe(bpipe); - if (status != 0) { - berrno be; - Jmsg(jcr, M_FATAL, 0, _("%s returned non-zero status=%d. ERR=%s\n"), name, - status, be.strerror(status)); - return false; - } - return true; -} + cmd = new_runscript(); + cmd->set_command(msg); + cmd->on_success = true; + cmd->on_failure = false; + cmd->when = SCRIPT_After; + jcr->RunScripts->append(cmd); -#define INC_LIST 0 -#define EXC_LIST 1 - -static void add_fname_to_list(JCR *jcr, char *fname, int list) -{ - char *p, *q; - BPIPE *bpipe; - POOLMEM *fn; - FILE *ffd; - char buf[1000]; - int optlen; - int stat; - - /* Skip leading options -- currently ignored */ - for (p=fname; *p && *p != ' '; p++) - { } - /* Skip spaces, and q points to first space */ - for (q=NULL; *p && *p == ' '; p++) { - if (!q) { - q = p; - } - } - - switch (*p) { - case '|': - p++; /* skip over | */ - fn = get_pool_memory(PM_FNAME); - fn = edit_job_codes(jcr, fn, p, ""); - bpipe = open_bpipe(fn, 0, "r"); - free_pool_memory(fn); - if (!bpipe) { - Jmsg(jcr, M_FATAL, 0, _("Cannot run program: %s. ERR=%s\n"), - p, strerror(errno)); - return; - } - /* Copy File options */ - if (list == INC_LIST) { - *q = 0; /* terminate options */ - bstrncpy(buf, fname, sizeof(buf)); - bstrncat(buf, " ", sizeof(buf)); - optlen = strlen(buf); - } else { - optlen = 0; - } - while (fgets(buf+optlen, sizeof(buf)-optlen, bpipe->rfd)) { - strip_trailing_junk(buf); - if (list == INC_LIST) { - add_fname_to_include_list((FF_PKT *)jcr->ff, 1, buf); - } else { - add_fname_to_exclude_list((FF_PKT *)jcr->ff, buf); - } - } - if ((stat=close_bpipe(bpipe)) != 0) { - Jmsg(jcr, M_FATAL, 0, _("Error running program: %s. RtnStat=%d ERR=%s\n"), - p, stat, strerror(errno)); - return; - } - break; - case '<': - p++; /* skip over < */ - if ((ffd = fopen(p, "r")) == NULL) { - berrno be; - Jmsg(jcr, M_FATAL, 0, _("Cannot open %s file: %s. ERR=%s\n"), - list==INC_LIST?"included":"excluded", p, be.strerror()); - return; - } - /* Copy File options */ - if (list == INC_LIST) { - *q = 0; /* terminate options */ - bstrncpy(buf, fname, sizeof(buf)); - bstrncat(buf, " ", sizeof(buf)); - optlen = strlen(buf); - } else { - optlen = 0; - } - while (fgets(buf+optlen, sizeof(buf)-optlen, ffd)) { - strip_trailing_junk(buf); - if (list == INC_LIST) { - add_fname_to_include_list((FF_PKT *)jcr->ff, 1, buf); - } else { - add_fname_to_exclude_list((FF_PKT *)jcr->ff, buf); - } - } - fclose(ffd); - break; - default: - if (list == INC_LIST) { - add_fname_to_include_list((FF_PKT *)jcr->ff, 1, fname); - } else { - add_fname_to_exclude_list((FF_PKT *)jcr->ff, p); - } - break; - } + free_pool_memory(msg); + return dir->fsend(OKRunAfter); } -/* - * - * Get list of files/directories to include from Director - * - */ -static int include_cmd(JCR *jcr) +static int runscript_cmd(JCR *jcr) { BSOCK *dir = jcr->dir_bsock; + POOLMEM *msg = get_memory(dir->msglen+1); + int on_success, on_failure, fail_on_error; - while (bnet_recv(dir) >= 0) { - dir->msg[dir->msglen] = 0; - strip_trailing_junk(dir->msg); - Dmsg1(010, "include file: %s\n", dir->msg); - add_fname_to_list(jcr, dir->msg, INC_LIST); + RUNSCRIPT *cmd = new_runscript() ; + + Dmsg1(100, "runscript_cmd: '%s'\n", dir->msg); + /* Note, we cannot sscanf into bools */ + if (sscanf(dir->msg, runscript, &on_success, + &on_failure, + &fail_on_error, + &cmd->when, + msg) != 5) { + pm_strcpy(jcr->errmsg, dir->msg); + Jmsg1(jcr, M_FATAL, 0, _("Bad RunScript command: %s\n"), jcr->errmsg); + dir->fsend(_("2905 Bad RunScript command.\n")); + free_runscript(cmd); + free_memory(msg); + return 0; } + cmd->on_success = on_success; + cmd->on_failure = on_failure; + cmd->fail_on_error = fail_on_error; + unbash_spaces(msg); + + cmd->set_command(msg); + cmd->debug(); + jcr->RunScripts->append(cmd); - return bnet_fsend(dir, OKinc); + free_pool_memory(msg); + return dir->fsend(OKRunScript); } + static bool init_fileset(JCR *jcr) { FF_PKT *ff; @@ -617,7 +588,7 @@ static bool init_fileset(JCR *jcr) if (!jcr->ff) { return false; } - ff = (FF_PKT *)jcr->ff; + ff = jcr->ff; if (ff->fileset) { return false; } @@ -645,8 +616,10 @@ static findFOPTS *start_options(FF_PKT *ff) fo->wild.init(1, true); fo->wilddir.init(1, true); fo->wildfile.init(1, true); + fo->wildbase.init(1, true); fo->base.init(1, true); fo->fstype.init(1, true); + fo->drivetype.init(1, true); incexe->current_opts = fo; incexe->opts_list.append(fo); } @@ -658,56 +631,74 @@ static findFOPTS *start_options(FF_PKT *ff) * Add fname to include/exclude fileset list. First check for * | and < and if necessary perform command. */ -static void add_file_to_fileset(JCR *jcr, const char *fname, findFILESET *fileset) +static void add_file_to_fileset(JCR *jcr, const char *fname, findFILESET *fileset, + bool is_file) { char *p; BPIPE *bpipe; POOLMEM *fn; FILE *ffd; char buf[1000]; + int ch; int stat; p = (char *)fname; - switch (*p) { + ch = (uint8_t)*p; + switch (ch) { case '|': - p++; /* skip over | */ + p++; /* skip over | */ fn = get_pool_memory(PM_FNAME); fn = edit_job_codes(jcr, fn, p, ""); bpipe = open_bpipe(fn, 0, "r"); - free_pool_memory(fn); if (!bpipe) { + berrno be; Jmsg(jcr, M_FATAL, 0, _("Cannot run program: %s. ERR=%s\n"), - p, strerror(errno)); - return; + p, be.bstrerror()); + free_pool_memory(fn); + return; } + free_pool_memory(fn); while (fgets(buf, sizeof(buf), bpipe->rfd)) { - strip_trailing_junk(buf); - fileset->incexe->name_list.append(bstrdup(buf)); + strip_trailing_junk(buf); + if (is_file) { + fileset->incexe->name_list.append(new_dlistString(buf)); + } else { + fileset->incexe->plugin_list.append(new_dlistString(buf)); + } } if ((stat=close_bpipe(bpipe)) != 0) { - Jmsg(jcr, M_FATAL, 0, _("Error running program: %s. RtnStat=%d ERR=%s\n"), - p, stat, strerror(errno)); - return; + berrno be; + Jmsg(jcr, M_FATAL, 0, _("Error running program: %s. stat=%d: ERR=%s\n"), + p, be.code(stat), be.bstrerror(stat)); + return; } break; case '<': Dmsg0(100, "Doing < include on client.\n"); - 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 FileSet input file: %s. ERR=%s\n"), - p, be.strerror()); - return; + p, be.bstrerror()); + return; } while (fgets(buf, sizeof(buf), ffd)) { - strip_trailing_junk(buf); + strip_trailing_junk(buf); Dmsg1(100, "%s\n", buf); - fileset->incexe->name_list.append(bstrdup(buf)); + if (is_file) { + fileset->incexe->name_list.append(new_dlistString(buf)); + } else { + fileset->incexe->plugin_list.append(new_dlistString(buf)); + } } fclose(ffd); break; default: - fileset->incexe->name_list.append(bstrdup(fname)); + if (is_file) { + fileset->incexe->name_list.append(new_dlistString(fname)); + } else { + fileset->incexe->plugin_list.append(new_dlistString(fname)); + } break; } } @@ -715,7 +706,7 @@ static void add_file_to_fileset(JCR *jcr, const char *fname, findFILESET *filese static void add_fileset(JCR *jcr, const char *item) { - FF_PKT *ff = (FF_PKT *)jcr->ff; + FF_PKT *ff = jcr->ff; findFILESET *fileset = ff->fileset; int state = fileset->state; findFOPTS *current_opts; @@ -737,6 +728,7 @@ static void add_fileset(JCR *jcr, const char *item) /* Skip all lines we receive after an error */ if (state == state_error) { + Dmsg0(100, "State=error return\n"); return; } @@ -748,6 +740,7 @@ static void add_fileset(JCR *jcr, const char *item) */ if (subcode != ' ') { state = state_error; + Dmsg0(100, "Set state=error\n"); } switch (code) { case 'I': @@ -755,7 +748,8 @@ static void add_fileset(JCR *jcr, const char *item) fileset->incexe = (findINCEXE *)malloc(sizeof(findINCEXE)); memset(fileset->incexe, 0, sizeof(findINCEXE)); fileset->incexe->opts_list.init(1, true); - fileset->incexe->name_list.init(1, true); + fileset->incexe->name_list.init(); /* for dlist; was 1,true for alist */ + fileset->incexe->plugin_list.init(); fileset->include_list.append(fileset->incexe); break; case 'E': @@ -763,16 +757,22 @@ static void add_fileset(JCR *jcr, const char *item) fileset->incexe = (findINCEXE *)malloc(sizeof(findINCEXE)); memset(fileset->incexe, 0, sizeof(findINCEXE)); fileset->incexe->opts_list.init(1, true); - fileset->incexe->name_list.init(1, true); + fileset->incexe->name_list.init(); + fileset->incexe->plugin_list.init(); fileset->exclude_list.append(fileset->incexe); break; case 'N': state = state_none; break; case 'F': - /* File item to either include/include list */ + /* File item to include or exclude list */ + state = state_include; + add_file_to_fileset(jcr, item, fileset, true); + break; + case 'P': + /* Plugin item to include list */ state = state_include; - add_file_to_fileset(jcr, item, fileset); + add_file_to_fileset(jcr, item, fileset, false); break; case 'R': current_opts = start_options(ff); @@ -781,27 +781,27 @@ static void add_fileset(JCR *jcr, const char *item) char prbuf[500]; preg = (regex_t *)malloc(sizeof(regex_t)); if (current_opts->flags & FO_IGNORECASE) { - rc = regcomp(preg, item, REG_EXTENDED|REG_ICASE); + rc = regcomp(preg, item, REG_EXTENDED|REG_ICASE); } else { - rc = regcomp(preg, item, REG_EXTENDED); + rc = regcomp(preg, item, REG_EXTENDED); } if (rc != 0) { - regerror(rc, preg, prbuf, sizeof(prbuf)); - regfree(preg); - free(preg); - Jmsg(jcr, M_FATAL, 0, "REGEX %s compile error. ERR=%s\n", item, prbuf); - state = state_error; - break; + regerror(rc, preg, prbuf, sizeof(prbuf)); + regfree(preg); + free(preg); + Jmsg(jcr, M_FATAL, 0, _("REGEX %s compile error. ERR=%s\n"), item, prbuf); + state = state_error; + break; } state = state_options; if (subcode == ' ') { - current_opts->regex.append(preg); + current_opts->regex.append(preg); } else if (subcode == 'D') { - current_opts->regexdir.append(preg); + current_opts->regexdir.append(preg); } else if (subcode == 'F') { - current_opts->regexfile.append(preg); + current_opts->regexfile.append(preg); } else { - state = state_error; + state = state_error; } break; case 'B': @@ -811,20 +811,28 @@ static void add_fileset(JCR *jcr, const char *item) break; case 'X': current_opts = start_options(ff); - current_opts->fstype.append(bstrdup(item)); state = state_options; + if (subcode == ' ') { + current_opts->fstype.append(bstrdup(item)); + } else if (subcode == 'D') { + current_opts->drivetype.append(bstrdup(item)); + } else { + state = state_error; + } break; case 'W': current_opts = start_options(ff); state = state_options; if (subcode == ' ') { - current_opts->wild.append(bstrdup(item)); + current_opts->wild.append(bstrdup(item)); } else if (subcode == 'D') { - current_opts->wilddir.append(bstrdup(item)); + current_opts->wilddir.append(bstrdup(item)); } else if (subcode == 'F') { - current_opts->wildfile.append(bstrdup(item)); + current_opts->wildfile.append(bstrdup(item)); + } else if (subcode == 'B') { + current_opts->wildbase.append(bstrdup(item)); } else { - state = state_error; + state = state_error; } break; case 'O': @@ -834,16 +842,16 @@ static void add_fileset(JCR *jcr, const char *item) break; case 'D': current_opts = start_options(ff); - current_opts->reader = bstrdup(item); +// current_opts->reader = bstrdup(item); state = state_options; break; case 'T': current_opts = start_options(ff); - current_opts->writer = bstrdup(item); +// current_opts->writer = bstrdup(item); state = state_options; break; default: - Jmsg(jcr, M_FATAL, 0, "Invalid FileSet command: %s\n", item); + Jmsg(jcr, M_FATAL, 0, _("Invalid FileSet command: %s\n"), item); state = state_error; break; } @@ -852,7 +860,9 @@ static void add_fileset(JCR *jcr, const char *item) static bool term_fileset(JCR *jcr) { - FF_PKT *ff = (FF_PKT *)jcr->ff; + FF_PKT *ff = jcr->ff; + +#ifdef xxx_DEBUG_CODE findFILESET *fileset = ff->fileset; int i, j, k; @@ -860,76 +870,91 @@ static bool term_fileset(JCR *jcr) findINCEXE *incexe = (findINCEXE *)fileset->include_list.get(i); Dmsg0(400, "I\n"); for (j=0; jopts_list.size(); j++) { - findFOPTS *fo = (findFOPTS *)incexe->opts_list.get(j); - for (k=0; kregex.size(); k++) { + findFOPTS *fo = (findFOPTS *)incexe->opts_list.get(j); + for (k=0; kregex.size(); k++) { Dmsg1(400, "R %s\n", (char *)fo->regex.get(k)); - } - for (k=0; kregexdir.size(); k++) { + } + for (k=0; kregexdir.size(); k++) { Dmsg1(400, "RD %s\n", (char *)fo->regexdir.get(k)); - } - for (k=0; kregexfile.size(); k++) { + } + for (k=0; kregexfile.size(); k++) { Dmsg1(400, "RF %s\n", (char *)fo->regexfile.get(k)); - } - for (k=0; kwild.size(); k++) { + } + for (k=0; kwild.size(); k++) { Dmsg1(400, "W %s\n", (char *)fo->wild.get(k)); - } - for (k=0; kwilddir.size(); k++) { + } + for (k=0; kwilddir.size(); k++) { Dmsg1(400, "WD %s\n", (char *)fo->wilddir.get(k)); - } - for (k=0; kwildfile.size(); k++) { + } + for (k=0; kwildfile.size(); k++) { Dmsg1(400, "WF %s\n", (char *)fo->wildfile.get(k)); - } - for (k=0; kbase.size(); k++) { + } + for (k=0; kwildbase.size(); k++) { + Dmsg1(400, "WB %s\n", (char *)fo->wildbase.get(k)); + } + for (k=0; kbase.size(); k++) { Dmsg1(400, "B %s\n", (char *)fo->base.get(k)); - } - for (k=0; kfstype.size(); k++) { + } + for (k=0; kfstype.size(); k++) { Dmsg1(400, "X %s\n", (char *)fo->fstype.get(k)); - } - if (fo->reader) { - Dmsg1(400, "D %s\n", fo->reader); - } - if (fo->writer) { - Dmsg1(400, "T %s\n", fo->writer); - } + } + for (k=0; kdrivetype.size(); k++) { + Dmsg1(400, "XD %s\n", (char *)fo->drivetype.get(k)); + } } - for (j=0; jname_list.size(); j++) { - Dmsg1(400, "F %s\n", (char *)incexe->name_list.get(j)); + dlistString *node; + foreach_dlist(node, &incexe->name_list) { + Dmsg1(400, "F %s\n", node->c_str()); + } + foreach_dlist(node, &incexe->plugin_list) { + Dmsg1(400, "P %s\n", node->c_str()); } } for (i=0; iexclude_list.size(); i++) { findINCEXE *incexe = (findINCEXE *)fileset->exclude_list.get(i); Dmsg0(400, "E\n"); for (j=0; jopts_list.size(); j++) { - findFOPTS *fo = (findFOPTS *)incexe->opts_list.get(j); - for (k=0; kregex.size(); k++) { + findFOPTS *fo = (findFOPTS *)incexe->opts_list.get(j); + for (k=0; kregex.size(); k++) { Dmsg1(400, "R %s\n", (char *)fo->regex.get(k)); - } - for (k=0; kregexdir.size(); k++) { + } + for (k=0; kregexdir.size(); k++) { Dmsg1(400, "RD %s\n", (char *)fo->regexdir.get(k)); - } - for (k=0; kregexfile.size(); k++) { + } + for (k=0; kregexfile.size(); k++) { Dmsg1(400, "RF %s\n", (char *)fo->regexfile.get(k)); - } - for (k=0; kwild.size(); k++) { + } + for (k=0; kwild.size(); k++) { Dmsg1(400, "W %s\n", (char *)fo->wild.get(k)); - } - for (k=0; kwilddir.size(); k++) { + } + for (k=0; kwilddir.size(); k++) { Dmsg1(400, "WD %s\n", (char *)fo->wilddir.get(k)); - } - for (k=0; kwildfile.size(); k++) { + } + for (k=0; kwildfile.size(); k++) { Dmsg1(400, "WF %s\n", (char *)fo->wildfile.get(k)); - } - for (k=0; kbase.size(); k++) { + } + for (k=0; kwildbase.size(); k++) { + Dmsg1(400, "WB %s\n", (char *)fo->wildbase.get(k)); + } + for (k=0; kbase.size(); k++) { Dmsg1(400, "B %s\n", (char *)fo->base.get(k)); - } - for (k=0; kfstype.size(); k++) { + } + for (k=0; kfstype.size(); k++) { Dmsg1(400, "X %s\n", (char *)fo->fstype.get(k)); - } + } + for (k=0; kdrivetype.size(); k++) { + Dmsg1(400, "XD %s\n", (char *)fo->drivetype.get(k)); + } + } + dlistString *node; + foreach_dlist(node, incexe->name_list) { + Dmsg1(400, "F %s\n", node->c_str()); } - for (j=0; jname_list.size(); j++) { - Dmsg1(400, "F %s\n", (char *)incexe->name_list.get(j)); + foreach_dlist(node, &incexe->plugin_list) { + Dmsg1(400, "P %s\n", node->c_str()); } } +#endif return ff->fileset->state != state_error; } @@ -943,77 +968,140 @@ static void set_options(findFOPTS *fo, const char *opts) { int j; const char *p; + char strip[100]; + +// Commented out as it is not backward compatible - KES +#ifdef HAVE_WIN32 +// fo->flags |= FO_IGNORECASE; /* always ignorecase under windows */ +#endif for (p=opts; *p; p++) { switch (*p) { case 'a': /* alway replace */ case '0': /* no option */ - break; + break; case 'e': - fo->flags |= FO_EXCLUDE; - break; + fo->flags |= FO_EXCLUDE; + break; case 'f': - fo->flags |= FO_MULTIFS; - break; + fo->flags |= FO_MULTIFS; + break; case 'h': /* no recursion */ - fo->flags |= FO_NO_RECURSION; - break; + fo->flags |= FO_NO_RECURSION; + break; case 'H': /* no hard link handling */ - fo->flags |= FO_NO_HARDLINK; - break; + fo->flags |= FO_NO_HARDLINK; + break; case 'i': - fo->flags |= FO_IGNORECASE; - break; + fo->flags |= FO_IGNORECASE; + break; case 'M': /* MD5 */ - fo->flags |= FO_MD5; - break; + fo->flags |= FO_MD5; + break; case 'n': - fo->flags |= FO_NOREPLACE; - break; + fo->flags |= FO_NOREPLACE; + break; case 'p': /* use portable data format */ - fo->flags |= FO_PORTABLE; - break; + fo->flags |= FO_PORTABLE; + break; case 'R': /* Resource forks and Finder Info */ - fo->flags |= FO_HFSPLUS; + fo->flags |= FO_HFSPLUS; case 'r': /* read fifo */ - fo->flags |= FO_READFIFO; - break; + fo->flags |= FO_READFIFO; + break; case 'S': - fo->flags |= FO_SHA1; - break; + switch(*(p + 1)) { + case '1': + fo->flags |= FO_SHA1; + p++; + break; +#ifdef HAVE_SHA2 + case '2': + fo->flags |= FO_SHA256; + p++; + break; + case '3': + fo->flags |= FO_SHA512; + p++; + break; +#endif + default: + /* + * If 2 or 3 is seen here, SHA2 is not configured, so + * eat the option, and drop back to SHA-1. + */ + if (p[1] == '2' || p[1] == '3') { + p++; + } + fo->flags |= FO_SHA1; + break; + } + break; case 's': - fo->flags |= FO_SPARSE; - break; + fo->flags |= FO_SPARSE; + break; case 'm': - fo->flags |= FO_MTIMEONLY; - break; + fo->flags |= FO_MTIMEONLY; + break; case 'k': - fo->flags |= FO_KEEPATIME; - break; + fo->flags |= FO_KEEPATIME; + break; case 'A': - fo->flags |= FO_ACL; - break; + fo->flags |= FO_ACL; + break; case 'V': /* verify options */ - /* Copy Verify Options */ + /* Copy Verify Options */ + for (j=0; *p && *p != ':'; p++) { + fo->VerifyOpts[j] = *p; + if (j < (int)sizeof(fo->VerifyOpts) - 1) { + j++; + } + } + fo->VerifyOpts[j] = 0; + break; + case 'C': /* accurate options */ + /* Copy Accurate Options */ for (j=0; *p && *p != ':'; p++) { - fo->VerifyOpts[j] = *p; - if (j < (int)sizeof(fo->VerifyOpts) - 1) { - j++; - } - } - fo->VerifyOpts[j] = 0; - break; + fo->AccurateOpts[j] = *p; + if (j < (int)sizeof(fo->AccurateOpts) - 1) { + j++; + } + } + fo->AccurateOpts[j] = 0; + break; + case 'P': /* strip path */ + /* Get integer */ + p++; /* skip P */ + for (j=0; *p && *p != ':'; p++) { + strip[j] = *p; + if (j < (int)sizeof(strip) - 1) { + j++; + } + } + strip[j] = 0; + fo->strip_path = atoi(strip); + fo->flags |= FO_STRIPPATH; + Dmsg2(100, "strip=%s strip_path=%d\n", strip, fo->strip_path); + break; case 'w': - fo->flags |= FO_IF_NEWER; - break; + fo->flags |= FO_IF_NEWER; + break; + case 'W': + fo->flags |= FO_ENHANCEDWILD; + break; case 'Z': /* gzip compression */ - fo->flags |= FO_GZIP; + fo->flags |= FO_GZIP; fo->GZIP_level = *++p - '0'; - Dmsg1(200, "Compression level=%d\n", fo->GZIP_level); - break; + break; + case 'K': + fo->flags |= FO_NOATIME; + break; + case 'c': + fo->flags |= FO_CHKCHANGES; + break; default: - Emsg1(M_ERROR, 0, "Unknown include/exclude option: %c\n", *p); - break; + Emsg1(M_ERROR, 0, _("Unknown include/exclude option: %c\n"), *p); + break; } } } @@ -1026,79 +1114,84 @@ static int fileset_cmd(JCR *jcr) { BSOCK *dir = jcr->dir_bsock; +#if defined(WIN32_VSS) + int vss = 0; + + sscanf(dir->msg, "fileset vss=%d", &vss); + enable_vss = vss; +#endif + if (!init_fileset(jcr)) { return 0; } - while (bnet_recv(dir) >= 0) { + while (dir->recv() >= 0) { strip_trailing_junk(dir->msg); - Dmsg1(400, "Fileset: %s\n", dir->msg); + Dmsg1(500, "Fileset: %s\n", dir->msg); add_fileset(jcr, dir->msg); } if (!term_fileset(jcr)) { return 0; } - return bnet_fsend(dir, OKinc); + return dir->fsend(OKinc); } - -/* - * Get list of files to exclude from Director - * - */ -static int exclude_cmd(JCR *jcr) +static void free_bootstrap(JCR *jcr) { - BSOCK *dir = jcr->dir_bsock; - - while (bnet_recv(dir) >= 0) { - dir->msg[dir->msglen] = 0; - strip_trailing_junk(dir->msg); - add_fname_to_list(jcr, dir->msg, EXC_LIST); - Dmsg1(110, "msg); + if (jcr->RestoreBootstrap) { + unlink(jcr->RestoreBootstrap); + free_pool_memory(jcr->RestoreBootstrap); + jcr->RestoreBootstrap = NULL; } - - return bnet_fsend(dir, OKexc); } +static pthread_mutex_t bsr_mutex = PTHREAD_MUTEX_INITIALIZER; +static uint32_t bsr_uniq = 0; + +/* + * The Director sends us the bootstrap file, which + * we will in turn pass to the SD. + */ static int bootstrap_cmd(JCR *jcr) { BSOCK *dir = jcr->dir_bsock; POOLMEM *fname = get_pool_memory(PM_FNAME); FILE *bs; - if (jcr->RestoreBootstrap) { - unlink(jcr->RestoreBootstrap); - free_pool_memory(jcr->RestoreBootstrap); - } - Mmsg(fname, "%s/%s.%s.bootstrap", me->working_directory, me->hdr.name, - jcr->Job); + free_bootstrap(jcr); + P(bsr_mutex); + bsr_uniq++; + Mmsg(fname, "%s/%s.%s.%d.bootstrap", me->working_directory, me->hdr.name, + jcr->Job, bsr_uniq); + V(bsr_mutex); Dmsg1(400, "bootstrap=%s\n", fname); jcr->RestoreBootstrap = fname; - bs = fopen(fname, "a+"); /* create file */ + bs = fopen(fname, "a+b"); /* create file */ if (!bs) { berrno be; + Jmsg(jcr, M_FATAL, 0, _("Could not create bootstrap file %s: ERR=%s\n"), + jcr->RestoreBootstrap, be.bstrerror()); /* * Suck up what he is sending to us so that he will then * read our error message. */ - while (bnet_recv(dir) >= 0) - { } - - Jmsg(jcr, M_FATAL, 0, _("Could not create bootstrap file %s: ERR=%s\n"), - jcr->RestoreBootstrap, be.strerror()); - free_pool_memory(jcr->RestoreBootstrap); - jcr->RestoreBootstrap = NULL; + while (dir->recv() >= 0) + { } + free_bootstrap(jcr); set_jcr_job_status(jcr, JS_ErrorTerminated); return 0; } - while (bnet_recv(dir) >= 0) { + while (dir->recv() >= 0) { Dmsg1(200, "filedmsg); fputs(dir->msg, bs); } fclose(bs); - - return bnet_fsend(dir, OKbootstrap); + /* + * Note, do not free the bootstrap yet -- it needs to be + * sent to the SD + */ + return dir->fsend(OKbootstrap); } @@ -1114,6 +1207,9 @@ static int level_cmd(JCR *jcr) level = get_memory(dir->msglen+1); Dmsg1(110, "level_cmd: %s", dir->msg); + if (strstr(dir->msg, "accurate")) { + jcr->accurate = true; + } if (sscanf(dir->msg, "level = %s ", level) != 1) { goto bail_out; } @@ -1123,64 +1219,78 @@ static int level_cmd(JCR *jcr) /* Full backup requested? */ } else if (strcmp(level, "full") == 0) { jcr->JobLevel = L_FULL; - } else if (strcmp(level, "differential") == 0) { + } else if (strstr(level, "differential")) { jcr->JobLevel = L_DIFFERENTIAL; free_memory(level); return 1; - } else if (strcmp(level, "incremental") == 0) { + } else if (strstr(level, "incremental")) { jcr->JobLevel = L_INCREMENTAL; free_memory(level); - return 1; + return 1; /* * We get his UTC since time, then sync the clocks and correct it - * to agree with our clock. + * to agree with our clock. */ } else if (strcmp(level, "since_utime") == 0) { buf = get_memory(dir->msglen+1); utime_t since_time, adj; btime_t his_time, bt_start, rt=0, bt_adj=0; + if (jcr->JobLevel == L_NONE) { + jcr->JobLevel = L_SINCE; /* if no other job level set, do it now */ + } if (sscanf(dir->msg, "level = since_utime %s mtime_only=%d", - buf, &mtime_only) != 2) { - goto bail_out; + buf, &mtime_only) != 2) { + goto bail_out; } - since_time = str_to_uint64(buf); /* this is the since time */ + since_time = str_to_uint64(buf); /* this is the since time */ + Dmsg1(100, "since_time=%d\n", (int)since_time); char ed1[50], ed2[50]; /* * Sync clocks by polling him for the time. We take * 10 samples of his time throwing out the first two. */ for (int i=0; i<10; i++) { - bt_start = get_current_btime(); - bnet_sig(dir, BNET_BTIME); /* poll for time */ - if (bnet_recv(dir) <= 0) { /* get response */ - goto bail_out; - } + bt_start = get_current_btime(); + dir->signal(BNET_BTIME); /* poll for time */ + if (dir->recv() <= 0) { /* get response */ + goto bail_out; + } if (sscanf(dir->msg, "btime %s", buf) != 1) { - goto bail_out; - } - if (i < 2) { /* toss first two results */ - continue; - } - his_time = str_to_uint64(buf); - rt = get_current_btime() - bt_start; /* compute round trip time */ - bt_adj -= his_time - bt_start - rt/2; - Dmsg2(200, "rt=%s adj=%s\n", edit_uint64(rt, ed1), edit_uint64(bt_adj, ed2)); + goto bail_out; + } + if (i < 2) { /* toss first two results */ + continue; + } + his_time = str_to_uint64(buf); + rt = get_current_btime() - bt_start; /* compute round trip time */ + Dmsg2(100, "Dirtime=%s FDtime=%s\n", edit_uint64(his_time, ed1), + edit_uint64(bt_start, ed2)); + bt_adj += bt_start - his_time - rt/2; + Dmsg2(100, "rt=%s adj=%s\n", edit_uint64(rt, ed1), edit_uint64(bt_adj, ed2)); } - bt_adj = bt_adj / 8; /* compute average time */ + bt_adj = bt_adj / 8; /* compute average time */ Dmsg2(100, "rt=%s adj=%s\n", edit_uint64(rt, ed1), edit_uint64(bt_adj, ed2)); adj = btime_to_utime(bt_adj); - since_time += adj; /* adjust for clock difference */ - if (adj != 0) { - Jmsg(jcr, M_INFO, 0, _("DIR and FD clocks differ by %d seconds, FD automatically adjusting.\n"), adj); + since_time += adj; /* adjust for clock difference */ + /* Don't notify if time within 3 seconds */ + if (adj > 3 || adj < -3) { + int type; + if (adj > 600 || adj < -600) { + type = M_WARNING; + } else { + type = M_INFO; + } + Jmsg(jcr, type, 0, _("DIR and FD clocks differ by %d seconds, FD automatically compensating.\n"), adj); } - bnet_sig(dir, BNET_EOD); + dir->signal(BNET_EOD); Dmsg2(100, "adj = %d since_time=%d\n", (int)adj, (int)since_time); - jcr->incremental = 1; /* set incremental or decremental backup */ + jcr->incremental = 1; /* set incremental or decremental backup */ jcr->mtime = (time_t)since_time; /* set since time */ + generate_plugin_event(jcr, bEventSince, (void *)jcr->mtime); } else { - Jmsg1(jcr, M_FATAL, 0, "Unknown backup level: %s\n", level); + Jmsg1(jcr, M_FATAL, 0, _("Unknown backup level: %s\n"), level); free_memory(level); return 0; } @@ -1188,7 +1298,8 @@ static int level_cmd(JCR *jcr) if (buf) { free_memory(buf); } - return bnet_fsend(dir, OKlevel); + generate_plugin_event(jcr, bEventLevel, (void *)jcr->JobLevel); + return dir->fsend(OKlevel); bail_out: pm_strcpy(jcr->errmsg, dir->msg); @@ -1209,11 +1320,11 @@ static int session_cmd(JCR *jcr) Dmsg1(100, "SessionCmd: %s", dir->msg); if (sscanf(dir->msg, sessioncmd, jcr->VolumeName, - &jcr->VolSessionId, &jcr->VolSessionTime, - &jcr->StartFile, &jcr->EndFile, - &jcr->StartBlock, &jcr->EndBlock) != 7) { + &jcr->VolSessionId, &jcr->VolSessionTime, + &jcr->StartFile, &jcr->EndFile, + &jcr->StartBlock, &jcr->EndBlock) != 7) { pm_strcpy(jcr->errmsg, dir->msg); - Jmsg(jcr, M_FATAL, 0, "Bad session command: %s", jcr->errmsg); + Jmsg(jcr, M_FATAL, 0, _("Bad session command: %s"), jcr->errmsg); return 0; } @@ -1226,10 +1337,10 @@ static int session_cmd(JCR *jcr) */ static int storage_cmd(JCR *jcr) { - int stored_port; /* storage daemon port */ - int enable_ssl; /* enable ssl to sd */ + int stored_port; /* storage daemon port */ + int enable_ssl; /* enable ssl to sd */ BSOCK *dir = jcr->dir_bsock; - BSOCK *sd; /* storage daemon bsock */ + BSOCK *sd; /* storage daemon bsock */ Dmsg1(100, "StorageCmd: %s", dir->msg); if (sscanf(dir->msg, storaddr, &jcr->stored_addr, &stored_port, &enable_ssl) != 3) { @@ -1240,20 +1351,20 @@ static int storage_cmd(JCR *jcr) Dmsg3(110, "Open storage: %s:%d ssl=%d\n", jcr->stored_addr, stored_port, enable_ssl); /* Open command communications with Storage daemon */ /* Try to connect for 1 hour at 10 second intervals */ - sd = bnet_connect(jcr, 10, (int)me->SDConnectTimeout, _("Storage daemon"), - jcr->stored_addr, NULL, stored_port, 1); + sd = bnet_connect(jcr, 10, (int)me->SDConnectTimeout, me->heartbeat_interval, + _("Storage daemon"), jcr->stored_addr, NULL, stored_port, 1); if (sd == NULL) { Jmsg(jcr, M_FATAL, 0, _("Failed to connect to Storage daemon: %s:%d\n"), - jcr->stored_addr, stored_port); + jcr->stored_addr, stored_port); Dmsg2(100, "Failed to connect to Storage daemon: %s:%d\n", - jcr->stored_addr, stored_port); + jcr->stored_addr, stored_port); return 0; } Dmsg0(110, "Connection OK to SD.\n"); jcr->store_bsock = sd; - bnet_fsend(sd, "Hello Start Job %s\n", jcr->Job); + sd->fsend("Hello Start Job %s\n", jcr->Job); if (!authenticate_storagedaemon(jcr)) { Jmsg(jcr, M_FATAL, 0, _("Failed to authenticate Storage daemon.\n")); return 0; @@ -1261,12 +1372,12 @@ static int storage_cmd(JCR *jcr) Dmsg0(110, "Authenticated with SD.\n"); /* Send OK to Director */ - return bnet_fsend(dir, OKstore); + return dir->fsend(OKstore); } /* - * Do a backup. For now, we handle only Full and Incremental. + * Do a backup. */ static int backup_cmd(JCR *jcr) { @@ -1274,24 +1385,34 @@ static int backup_cmd(JCR *jcr) BSOCK *sd = jcr->store_bsock; int ok = 0; int SDJobStatus; - char ed1[50], ed2[50]; + +#if defined(WIN32_VSS) + // capture state here, if client is backed up by multiple directors + // and one enables vss and the other does not then enable_vss can change + // between here and where its evaluated after the job completes. + jcr->VSS = g_pVSSClient && enable_vss; + if (jcr->VSS) { + /* Run only one at a time */ + P(vss_mutex); + } +#endif set_jcr_job_status(jcr, JS_Blocked); jcr->JobType = JT_BACKUP; - Dmsg1(100, "begin backup ff=%p\n", (FF_PKT *)jcr->ff); + Dmsg1(100, "begin backup ff=%p\n", jcr->ff); if (sd == NULL) { Jmsg(jcr, M_FATAL, 0, _("Cannot contact Storage daemon\n")); goto cleanup; } - bnet_fsend(dir, OKbackup); + dir->fsend(OKbackup); Dmsg1(110, "bfiled>dird: %s", dir->msg); /* * Send Append Open Session to Storage daemon */ - bnet_fsend(sd, append_open); + sd->fsend(append_open); Dmsg1(110, ">stored: %s", sd->msg); /* * Expect to receive back the Ticket number @@ -1300,7 +1421,7 @@ static int backup_cmd(JCR *jcr) Dmsg1(110, "msg); if (sscanf(sd->msg, OK_open, &jcr->Ticket) != 1) { Jmsg(jcr, M_FATAL, 0, _("Bad response to append open: %s\n"), sd->msg); - goto cleanup; + goto cleanup; } Dmsg1(110, "Got Ticket=%d\n", jcr->Ticket); } else { @@ -1311,7 +1432,7 @@ static int backup_cmd(JCR *jcr) /* * Send Append data command to Storage daemon */ - bnet_fsend(sd, append_data, jcr->Ticket); + sd->fsend(append_data, jcr->Ticket); Dmsg1(110, ">stored: %s", sd->msg); /* @@ -1321,6 +1442,46 @@ static int backup_cmd(JCR *jcr) if (!response(jcr, sd, OK_data, "Append Data")) { goto cleanup; } + + generate_daemon_event(jcr, "JobStart"); + generate_plugin_event(jcr, bEventStartBackupJob); + +#if defined(WIN32_VSS) + /* START VSS ON WIN32 */ + if (jcr->VSS) { + if (g_pVSSClient->InitializeForBackup()) { + /* tell vss which drives to snapshot */ + char szWinDriveLetters[27]; + if (get_win32_driveletters(jcr->ff, szWinDriveLetters)) { + Jmsg(jcr, M_INFO, 0, _("Generate VSS snapshots. Driver=\"%s\", Drive(s)=\"%s\"\n"), g_pVSSClient->GetDriverName(), szWinDriveLetters); + if (!g_pVSSClient->CreateSnapshots(szWinDriveLetters)) { + Jmsg(jcr, M_WARNING, 0, _("Generate VSS snapshots failed.\n")); + jcr->Errors++; + } else { + /* tell user if snapshot creation of a specific drive failed */ + int i; + for (i=0; i < (int)strlen(szWinDriveLetters); i++) { + if (islower(szWinDriveLetters[i])) { + Jmsg(jcr, M_WARNING, 0, _("Generate VSS snapshot of drive \"%c:\\\" failed. VSS support is disabled on this drive.\n"), szWinDriveLetters[i]); + jcr->Errors++; + } + } + /* inform user about writer states */ + for (i=0; i < (int)g_pVSSClient->GetWriterCount(); i++) + if (g_pVSSClient->GetWriterState(i) < 1) { + Jmsg(jcr, M_WARNING, 0, _("VSS Writer (PrepareForBackup): %s\n"), g_pVSSClient->GetWriterInfo(i)); + jcr->Errors++; + } + } + } else { + Jmsg(jcr, M_INFO, 0, _("No drive letters found for generating VSS snapshots.\n")); + } + } else { + berrno be; + Jmsg(jcr, M_WARNING, 0, _("VSS was not initialized properly. VSS support is disabled. ERR=%s\n"), be.bstrerror()); + } + } +#endif /* * Send Files to Storage daemon @@ -1329,58 +1490,75 @@ static int backup_cmd(JCR *jcr) if (!blast_data_to_storage_daemon(jcr, NULL)) { set_jcr_job_status(jcr, JS_ErrorTerminated); bnet_suppress_error_messages(sd, 1); + bget_msg(sd); /* Read final response from append_data */ Dmsg0(110, "Error in blast_data.\n"); } else { set_jcr_job_status(jcr, JS_Terminated); + if (jcr->JobStatus != JS_Terminated) { - bnet_suppress_error_messages(sd, 1); - goto cleanup; /* bail out now */ + bnet_suppress_error_messages(sd, 1); + goto cleanup; /* bail out now */ } /* * Expect to get response to append_data from Storage daemon */ if (!response(jcr, sd, OK_append, "Append Data")) { - set_jcr_job_status(jcr, JS_ErrorTerminated); - goto cleanup; + set_jcr_job_status(jcr, JS_ErrorTerminated); + goto cleanup; } /* * Send Append End Data to Storage daemon */ - bnet_fsend(sd, append_end, jcr->Ticket); + sd->fsend(append_end, jcr->Ticket); /* Get end OK */ if (!response(jcr, sd, OK_end, "Append End")) { - set_jcr_job_status(jcr, JS_ErrorTerminated); - goto cleanup; + set_jcr_job_status(jcr, JS_ErrorTerminated); + goto cleanup; } /* * Send Append Close to Storage daemon */ - bnet_fsend(sd, append_close, jcr->Ticket); + sd->fsend(append_close, jcr->Ticket); while (bget_msg(sd) >= 0) { /* stop on signal or error */ - if (sscanf(sd->msg, OK_close, &SDJobStatus) == 1) { - ok = 1; + if (sscanf(sd->msg, OK_close, &SDJobStatus) == 1) { + ok = 1; Dmsg2(200, "SDJobStatus = %d %c\n", SDJobStatus, (char)SDJobStatus); - } + } } if (!ok) { Jmsg(jcr, M_FATAL, 0, _("Append Close with SD failed.\n")); - goto cleanup; + goto cleanup; } if (SDJobStatus != JS_Terminated) { Jmsg(jcr, M_FATAL, 0, _("Bad status %d returned from Storage Daemon.\n"), - SDJobStatus); + SDJobStatus); } } cleanup: - bnet_fsend(dir, EndJob, jcr->JobStatus, jcr->JobFiles, - edit_uint64(jcr->ReadBytes, ed1), - edit_uint64(jcr->JobBytes, ed2), jcr->Errors); - Dmsg1(110, "End FD msg: %s\n", dir->msg); +#if defined(WIN32_VSS) + /* STOP VSS ON WIN32 */ + /* tell vss to close the backup session */ + if (jcr->VSS) { + if (g_pVSSClient->CloseBackup()) { + /* inform user about writer states */ + for (int i=0; i<(int)g_pVSSClient->GetWriterCount(); i++) { + int msg_type = M_INFO; + if (g_pVSSClient->GetWriterState(i) < 1) { + msg_type = M_WARNING; + jcr->Errors++; + } + Jmsg(jcr, msg_type, 0, _("VSS Writer (BackupComplete): %s\n"), g_pVSSClient->GetWriterInfo(i)); + } + } + V(vss_mutex); + } +#endif - return 0; /* return and stop command loop */ + generate_plugin_event(jcr, bEventEndBackupJob); + return 0; /* return and stop command loop */ } /* @@ -1391,13 +1569,14 @@ static int verify_cmd(JCR *jcr) { BSOCK *dir = jcr->dir_bsock; BSOCK *sd = jcr->store_bsock; - char level[100], ed1[50], ed2[50]; + char level[100]; jcr->JobType = JT_VERIFY; if (sscanf(dir->msg, verifycmd, level) != 1) { - bnet_fsend(dir, "2994 Bad verify command: %s\n", dir->msg); + dir->fsend(_("2994 Bad verify command: %s\n"), dir->msg); return 0; } + if (strcasecmp(level, "init") == 0) { jcr->JobLevel = L_VERIFY_INIT; } else if (strcasecmp(level, "catalog") == 0){ @@ -1409,11 +1588,16 @@ static int verify_cmd(JCR *jcr) } else if (strcasecmp(level, "disk_to_catalog") == 0) { jcr->JobLevel = L_VERIFY_DISK_TO_CATALOG; } else { - bnet_fsend(dir, "2994 Bad verify level: %s\n", dir->msg); + dir->fsend(_("2994 Bad verify level: %s\n"), dir->msg); return 0; } - bnet_fsend(dir, OKverify); + dir->fsend(OKverify); + + generate_daemon_event(jcr, "JobStart"); + generate_plugin_event(jcr, bEventLevel, (void *)jcr->JobLevel); + generate_plugin_event(jcr, bEventStartVerifyJob); + Dmsg1(110, "bfiled>dird: %s", dir->msg); switch (jcr->JobLevel) { @@ -1423,7 +1607,7 @@ static int verify_cmd(JCR *jcr) break; case L_VERIFY_VOLUME_TO_CATALOG: if (!open_sd_read_session(jcr)) { - return 0; + return 0; } start_dir_heartbeat(jcr); do_verify_volume(jcr); @@ -1431,34 +1615,27 @@ static int verify_cmd(JCR *jcr) /* * Send Close session command to Storage daemon */ - bnet_fsend(sd, read_close, jcr->Ticket); + sd->fsend(read_close, jcr->Ticket); Dmsg1(130, "bfiled>stored: %s", sd->msg); /* ****FIXME**** check response */ - bget_msg(sd); /* get OK */ + bget_msg(sd); /* get OK */ /* Inform Storage daemon that we are done */ - bnet_sig(sd, BNET_TERMINATE); + sd->signal(BNET_TERMINATE); break; case L_VERIFY_DISK_TO_CATALOG: do_verify(jcr); break; default: - bnet_fsend(dir, "2994 Bad verify level: %s\n", dir->msg); + dir->fsend(_("2994 Bad verify level: %s\n"), dir->msg); return 0; } - bnet_sig(dir, BNET_EOD); - - /* Send termination status back to Dir */ - bnet_fsend(dir, EndJob, jcr->JobStatus, jcr->JobFiles, - edit_uint64(jcr->ReadBytes, ed1), - edit_uint64(jcr->JobBytes, ed2), jcr->Errors); - - /* Inform Director that we are done */ - bnet_sig(dir, BNET_TERMINATE); - return 0; /* return and terminate command loop */ + dir->signal(BNET_EOD); + generate_plugin_event(jcr, bEventEndVerifyJob); + return 0; /* return and terminate command loop */ } /* @@ -1469,45 +1646,60 @@ static int restore_cmd(JCR *jcr) { BSOCK *dir = jcr->dir_bsock; BSOCK *sd = jcr->store_bsock; - POOLMEM *where; + POOLMEM *args; + bool use_regexwhere=false; int prefix_links; char replace; - char ed1[50], ed2[50]; /* * Scan WHERE (base directory for restore) from command */ Dmsg0(150, "restore command\n"); /* Pickup where string */ - where = get_memory(dir->msglen+1); - *where = 0; - - if (sscanf(dir->msg, restorecmd, &replace, &prefix_links, where) != 3) { - if (sscanf(dir->msg, restorecmd1, &replace, &prefix_links) != 2) { - pm_strcpy(jcr->errmsg, dir->msg); - Jmsg(jcr, M_FATAL, 0, _("Bad replace command. CMD=%s\n"), jcr->errmsg); - return 0; + args = get_memory(dir->msglen+1); + *args = 0; + + if (sscanf(dir->msg, restorecmd, &replace, &prefix_links, args) != 3) { + if (sscanf(dir->msg, restorecmdR, &replace, &prefix_links, args) != 3){ + if (sscanf(dir->msg, restorecmd1, &replace, &prefix_links) != 2) { + pm_strcpy(jcr->errmsg, dir->msg); + Jmsg(jcr, M_FATAL, 0, _("Bad replace command. CMD=%s\n"), jcr->errmsg); + return 0; + } + *args = 0; } - *where = 0; + use_regexwhere = true; } /* Turn / into nothing */ - if (where[0] == '/' && where[1] == 0) { - where[0] = 0; + if (IsPathSeparator(args[0]) && args[1] == '\0') { + args[0] = '\0'; + } + + Dmsg2(150, "Got replace %c, where=%s\n", replace, args); + unbash_spaces(args); + + if (use_regexwhere) { + jcr->where_bregexp = get_bregexps(args); + if (!jcr->where_bregexp) { + Jmsg(jcr, M_FATAL, 0, _("Bad where regexp. where=%s\n"), args); + free_pool_memory(args); + return 0; + } + } else { + jcr->where = bstrdup(args); } - Dmsg2(150, "Got replace %c, where=%s\n", replace, where); - unbash_spaces(where); - jcr->where = bstrdup(where); - free_pool_memory(where); + free_pool_memory(args); jcr->replace = replace; jcr->prefix_links = prefix_links; - bnet_fsend(dir, OKrestore); + dir->fsend(OKrestore); Dmsg1(110, "bfiled>dird: %s", dir->msg); jcr->JobType = JT_RESTORE; set_jcr_job_status(jcr, JS_Blocked); + if (!open_sd_read_session(jcr)) { set_jcr_job_status(jcr, JS_ErrorTerminated); goto bail_out; @@ -1519,6 +1711,8 @@ static int restore_cmd(JCR *jcr) * Do restore of files and data */ start_dir_heartbeat(jcr); + generate_daemon_event(jcr, "JobStart"); + generate_plugin_event(jcr, bEventStartRestoreJob); do_restore(jcr); stop_dir_heartbeat(jcr); @@ -1530,29 +1724,23 @@ static int restore_cmd(JCR *jcr) /* * Send Close session command to Storage daemon */ - bnet_fsend(sd, read_close, jcr->Ticket); + sd->fsend(read_close, jcr->Ticket); Dmsg1(130, "bfiled>stored: %s", sd->msg); - bget_msg(sd); /* get OK */ + bget_msg(sd); /* get OK */ /* Inform Storage daemon that we are done */ - bnet_sig(sd, BNET_TERMINATE); + sd->signal(BNET_TERMINATE); bail_out: if (jcr->Errors) { set_jcr_job_status(jcr, JS_ErrorTerminated); } - /* Send termination status back to Dir */ - bnet_fsend(dir, EndJob, jcr->JobStatus, jcr->JobFiles, - edit_uint64(jcr->ReadBytes, ed1), - edit_uint64(jcr->JobBytes, ed2), jcr->Errors); - - /* Inform Director that we are done */ - bnet_sig(dir, BNET_TERMINATE); Dmsg0(130, "Done in job.c\n"); - return 0; /* return and terminate command loop */ + generate_plugin_event(jcr, bEventEndRestoreJob); + return 0; /* return and terminate command loop */ } static int open_sd_read_session(JCR *jcr) @@ -1569,7 +1757,7 @@ static int open_sd_read_session(JCR *jcr) /* * Open Read Session with Storage daemon */ - bnet_fsend(sd, read_open, jcr->VolumeName, + bnet_fsend(sd, read_open, "DummyVolume", jcr->VolSessionId, jcr->VolSessionTime, jcr->StartFile, jcr->EndFile, jcr->StartBlock, jcr->EndBlock); Dmsg1(110, ">stored: %s", sd->msg); @@ -1581,7 +1769,7 @@ static int open_sd_read_session(JCR *jcr) Dmsg1(110, "bfiledmsg); if (sscanf(sd->msg, OK_open, &jcr->Ticket) != 1) { Jmsg(jcr, M_FATAL, 0, _("Bad response to SD read open: %s\n"), sd->msg); - return 0; + return 0; } Dmsg1(110, "bfiled: got Ticket=%d\n", jcr->Ticket); } else { @@ -1617,18 +1805,15 @@ static void filed_free_jcr(JCR *jcr) if (jcr->store_bsock) { bnet_close(jcr->store_bsock); } - if (jcr->RestoreBootstrap) { - unlink(jcr->RestoreBootstrap); - free_pool_memory(jcr->RestoreBootstrap); - jcr->RestoreBootstrap = NULL; - } + free_bootstrap(jcr); if (jcr->last_fname) { free_pool_memory(jcr->last_fname); } - if (jcr->RunAfterJob) { - free_pool_memory(jcr->RunAfterJob); - } + free_runscripts(jcr->RunScripts); + delete jcr->RunScripts; + if (jcr->JobId != 0) + write_state_file(me->working_directory, "bacula-fd", get_first_port_host_order(me->FDaddrs)); return; } @@ -1638,7 +1823,7 @@ static void filed_free_jcr(JCR *jcr) * sent. Check that the response is OK. * * Returns: 0 on failure - * 1 on success + * 1 on success */ int response(JCR *jcr, BSOCK *sd, char *resp, const char *cmd) { @@ -1648,18 +1833,18 @@ int response(JCR *jcr, BSOCK *sd, char *resp, const char *cmd) if (bget_msg(sd) > 0) { Dmsg0(110, sd->msg); if (strcmp(sd->msg, resp) == 0) { - return 1; + return 1; } } if (job_canceled(jcr)) { - return 0; /* if canceled avoid useless error messages */ + return 0; /* if canceled avoid useless error messages */ } if (is_bnet_error(sd)) { Jmsg2(jcr, M_FATAL, 0, _("Comm error with SD. bad response to %s. ERR=%s\n"), - cmd, bnet_strerror(sd)); + cmd, bnet_strerror(sd)); } else { Jmsg3(jcr, M_FATAL, 0, _("Bad response to %s command. Wanted %s, got %s\n"), - cmd, resp, sd->msg); + cmd, resp, sd->msg); } return 0; } @@ -1676,11 +1861,11 @@ static int send_bootstrap_file(JCR *jcr) if (!jcr->RestoreBootstrap) { return 1; } - 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.bstrerror()); set_jcr_job_status(jcr, JS_ErrorTerminated); goto bail_out; } @@ -1699,11 +1884,6 @@ static int send_bootstrap_file(JCR *jcr) stat = 1; bail_out: - if (jcr->RestoreBootstrap) { - unlink(jcr->RestoreBootstrap); - free_pool_memory(jcr->RestoreBootstrap); - jcr->RestoreBootstrap = NULL; - } - + free_bootstrap(jcr); return stat; }