X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Ffiled%2Fjob.c;h=4d825499ee11eac6cc3943eaadcac7d3dc747284;hb=290b831a27a67f4e405c63f28378cd04c7c9863e;hp=03c971d8e8e6836282ba75ce4d3425d8b124f64b;hpb=0e4dd963ce6b1f2b1e7fe2d54910f836cb43ea57;p=bacula%2Fbacula diff --git a/bacula/src/filed/job.c b/bacula/src/filed/job.c index 03c971d8e8..4d825499ee 100644 --- a/bacula/src/filed/job.c +++ b/bacula/src/filed/job.c @@ -1,7 +1,7 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2000-2007 Free Software Foundation Europe e.V. + Copyright (C) 2000-2009 Free Software Foundation Europe e.V. The main author of Bacula is Kern Sibbald, with contributions from many others, a complete list can be found in the file AUTHORS. @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - Bacula® is a registered trademark of John Walker. + Bacula® is a registered trademark of Kern Sibbald. The licensor of Bacula is the Free Software Foundation Europe (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich, Switzerland, email:ftf@fsfeurope.org. @@ -41,7 +41,7 @@ #include "vss.h" static pthread_mutex_t vss_mutex = PTHREAD_MUTEX_INITIALIZER; -static int enable_vss; +static int enable_vss = 0; #endif extern CLIENT *me; /* our client resource */ @@ -49,6 +49,7 @@ 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); @@ -106,6 +107,7 @@ static struct s_cmds cmds[] = { {"RunBeforeJob", runbefore_cmd, 0}, {"RunAfterJob", runafter_cmd, 0}, {"Run", runscript_cmd, 0}, + {"accurate", accurate_cmd, 0}, {NULL, NULL} /* list terminator */ }; @@ -144,6 +146,7 @@ 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"; +static char BADcmd[] = "2902 Bad %s\n"; /* Responses received from Storage Daemon */ @@ -203,6 +206,7 @@ void *handle_client_request(void *dirp) bool found, quit; JCR *jcr; BSOCK *dir = (BSOCK *)dirp; + const char jobname[12] = "*Director*"; jcr = new_jcr(sizeof(JCR), filed_free_jcr); /* create JCR */ jcr->dir_bsock = dir; @@ -213,20 +217,20 @@ void *handle_client_request(void *dirp) jcr->last_fname[0] = 0; jcr->client_name = get_memory(strlen(my_name) + 1); pm_strcpy(jcr->client_name, my_name); - jcr->pki_sign = me->pki_sign; - jcr->pki_encrypt = me->pki_encrypt; - jcr->pki_keypair = me->pki_keypair; - jcr->pki_signers = me->pki_signers; - jcr->pki_recipients = me->pki_recipients; + bstrncpy(jcr->Job, jobname, sizeof(jobname)); /* dummy */ + 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 */ for (quit=false; !quit;) { - /* Read command */ - if (bnet_recv(dir) < 0) { + if (dir->recv() < 0) { break; /* connection terminated */ } dir->msg[dir->msglen] = 0; @@ -236,26 +240,26 @@ void *handle_client_request(void *dirp) 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); + dir->fsend(no_auth); + dir->signal(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); + dir->fsend(invalid_cmd); + dir->signal(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 */ - Dmsg1(20, "Quit command loop. Canceled=%d\n", job_canceled(jcr)); + Dmsg1(100, "Quit command loop. Canceled=%d\n", job_canceled(jcr)); } break; } } if (!found) { /* command not found */ - bnet_fsend(dir, errmsg); + dir->fsend(errmsg); quit = true; break; } @@ -263,18 +267,31 @@ void *handle_client_request(void *dirp) /* Inform Storage daemon that we are done */ if (jcr->store_bsock) { - bnet_sig(jcr->store_bsock, BNET_TERMINATE); + jcr->store_bsock->signal(BNET_TERMINATE); } /* 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 */ + dir->fsend(EndJob, jcr->JobStatus, jcr->JobFiles, + edit_uint64(jcr->ReadBytes, ed1), + edit_uint64(jcr->JobBytes, ed2), jcr->JobErrors, jcr->VSS, + jcr->crypto.pki_encrypt); + Dmsg1(110, "End FD msg: %s\n", dir->msg); + } + 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 = jcr->ff; @@ -289,6 +306,12 @@ void *handle_client_request(void *dirp) for (k=0; kregex.size(); k++) { regfree((regex_t *)fo->regex.get(k)); } + for (k=0; kregexdir.size(); k++) { + regfree((regex_t *)fo->regexdir.get(k)); + } + for (k=0; kregexfile.size(); k++) { + regfree((regex_t *)fo->regexfile.get(k)); + } fo->regex.destroy(); fo->regexdir.destroy(); fo->regexfile.destroy(); @@ -299,15 +322,13 @@ void *handle_client_request(void *dirp) fo->base.destroy(); fo->fstype.destroy(); fo->drivetype.destroy(); - if (fo->reader) { - free(fo->reader); - } - if (fo->writer) { - free(fo->writer); + if (fo->ignoredir != NULL) { + free(fo->ignoredir); } } incexe->opts_list.destroy(); incexe->name_list.destroy(); + incexe->plugin_list.destroy(); } fileset->include_list.destroy(); @@ -329,6 +350,7 @@ void *handle_client_request(void *dirp) } incexe->opts_list.destroy(); incexe->name_list.destroy(); + incexe->plugin_list.destroy(); } fileset->exclude_list.destroy(); free(fileset); @@ -370,21 +392,22 @@ 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) { cjcr->store_bsock->set_timed_out(); cjcr->store_bsock->set_terminated(); pthread_kill(cjcr->my_thread_id, TIMEOUT_SIGNAL); } + generate_plugin_event(cjcr, bEventCancelCommand, NULL); set_jcr_job_status(cjcr, JS_Canceled); free_jcr(cjcr); - bnet_fsend(dir, _("2001 Job %s marked to be canceled.\n"), Job); + 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; } @@ -401,7 +424,7 @@ 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; @@ -424,7 +447,7 @@ static int estimate_cmd(JCR *jcr) make_estimate(jcr); 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; } @@ -442,13 +465,16 @@ static int job_cmd(JCR *jcr) 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); + Mmsg(jcr->errmsg, "JobId=%d Job=%s", jcr->JobId, jcr->Job); + new_plugins(jcr); /* instantiate plugins for this jcr */ + generate_plugin_event(jcr, bEventJobStart, (void *)jcr->errmsg); return dir->fsend(OKjob, VERSION, LSMDATE, HOST_OS, DISTNAME, DISTVER); } @@ -478,10 +504,10 @@ static int runbefore_cmd(JCR *jcr) 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; } } @@ -492,11 +518,11 @@ static int runbeforenow_cmd(JCR *jcr) run_scripts(jcr, jcr->RunScripts, "ClientBeforeJob"); if (job_canceled(jcr)) { - bnet_fsend(dir, _("2905 Bad RunBeforeNow command.\n")); + dir->fsend(_("2905 Bad RunBeforeNow command.\n")); Dmsg0(100, "Back from run_scripts ClientBeforeJob now: FAILED\n"); return 0; } else { - bnet_fsend(dir, OKRunBeforeNow); + dir->fsend(OKRunBeforeNow); Dmsg0(100, "Back from run_scripts ClientBeforeJob now: OK\n"); return 1; } @@ -512,7 +538,7 @@ static int runafter_cmd(JCR *jcr) 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; } @@ -527,7 +553,7 @@ static int runafter_cmd(JCR *jcr) jcr->RunScripts->append(cmd); free_pool_memory(msg); - return bnet_fsend(dir, OKRunAfter); + return dir->fsend(OKRunAfter); } static int runscript_cmd(JCR *jcr) @@ -547,7 +573,7 @@ static int runscript_cmd(JCR *jcr) msg) != 5) { pm_strcpy(jcr->errmsg, dir->msg); Jmsg1(jcr, M_FATAL, 0, _("Bad RunScript command: %s\n"), jcr->errmsg); - bnet_fsend(dir, _("2905 Bad RunScript command.\n")); + dir->fsend(_("2905 Bad RunScript command.\n")); free_runscript(cmd); free_memory(msg); return 0; @@ -562,7 +588,7 @@ static int runscript_cmd(JCR *jcr) jcr->RunScripts->append(cmd); free_pool_memory(msg); - return bnet_fsend(dir, OKRunScript); + return dir->fsend(OKRunScript); } @@ -617,7 +643,8 @@ 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; @@ -645,7 +672,11 @@ static void add_file_to_fileset(JCR *jcr, const char *fname, findFILESET *filese free_pool_memory(fn); while (fgets(buf, sizeof(buf), bpipe->rfd)) { strip_trailing_junk(buf); - fileset->incexe->name_list.append(new_dlistString(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) { berrno be; @@ -655,7 +686,7 @@ static void add_file_to_fileset(JCR *jcr, const char *fname, findFILESET *filese } break; case '<': - Dmsg0(100, "Doing < include on client.\n"); + Dmsg1(100, "Doing < of '%s' include on client.\n", p + 1); p++; /* skip over < */ if ((ffd = fopen(p, "rb")) == NULL) { berrno be; @@ -666,12 +697,25 @@ static void add_file_to_fileset(JCR *jcr, const char *fname, findFILESET *filese while (fgets(buf, sizeof(buf), ffd)) { strip_trailing_junk(buf); Dmsg1(100, "%s\n", buf); - fileset->incexe->name_list.append(new_dlistString(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(new_dlistString(fname)); + if (is_file) { + fileset->incexe->name_list.append(new_dlistString(fname)); + } else { + if (me->plugin_directory) { + fileset->incexe->plugin_list.append(new_dlistString(fname)); + } else { + Jmsg(jcr, M_FATAL, 0, _("Plugin Directory not defined. Cannot use plugin: \"%\"\n"), + fname); + } + } break; } } @@ -713,7 +757,7 @@ static void add_fileset(JCR *jcr, const char *item) */ if (subcode != ' ') { state = state_error; - Dmsg0(100, "Set state=error\n"); + Dmsg0(100, "Set state=error or double code.\n"); } switch (code) { case 'I': @@ -722,6 +766,7 @@ static void add_fileset(JCR *jcr, const char *item) memset(fileset->incexe, 0, sizeof(findINCEXE)); fileset->incexe->opts_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': @@ -730,15 +775,21 @@ static void add_fileset(JCR *jcr, const char *item) memset(fileset->incexe, 0, sizeof(findINCEXE)); fileset->incexe->opts_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); @@ -806,14 +857,19 @@ static void add_fileset(JCR *jcr, const char *item) set_options(current_opts, item); state = state_options; break; + case 'Z': + current_opts = start_options(ff); + current_opts->ignoredir = bstrdup(item); + state = state_options; + 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: @@ -828,7 +884,7 @@ static bool term_fileset(JCR *jcr) { FF_PKT *ff = jcr->ff; -#ifdef xxx +#ifdef xxx_DEBUG_CODE findFILESET *fileset = ff->fileset; int i, j, k; @@ -867,17 +923,17 @@ static bool term_fileset(JCR *jcr) for (k=0; kdrivetype.size(); k++) { Dmsg1(400, "XD %s\n", (char *)fo->drivetype.get(k)); } - if (fo->reader) { - Dmsg1(400, "D %s\n", fo->reader); - } - if (fo->writer) { - Dmsg1(400, "T %s\n", fo->writer); + if (fo->ignoredir) { + Dmsg1(400, "Z %s\n", fo->ignoredir); } } 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); @@ -919,6 +975,9 @@ static bool term_fileset(JCR *jcr) 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()); + } } #endif return ff->fileset->state != state_error; @@ -936,6 +995,11 @@ static void set_options(findFOPTS *fo, const char *opts) 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 */ @@ -1020,6 +1084,16 @@ static void set_options(findFOPTS *fo, const char *opts) } fo->VerifyOpts[j] = 0; break; + case 'C': /* accurate options */ + /* Copy Accurate Options */ + for (j=0; *p && *p != ':'; p++) { + 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 */ @@ -1050,6 +1124,12 @@ static void set_options(findFOPTS *fo, const char *opts) case 'c': fo->flags |= FO_CHKCHANGES; break; + case 'N': + fo->flags |= FO_HONOR_NODUMP; + break; + case 'X': + fo->flags |= FO_XATTR; + break; default: Emsg1(M_ERROR, 0, _("Unknown include/exclude option: %c\n"), *p); break; @@ -1075,7 +1155,7 @@ static int fileset_cmd(JCR *jcr) if (!init_fileset(jcr)) { return 0; } - while (bnet_recv(dir) >= 0) { + while (dir->recv() >= 0) { strip_trailing_junk(dir->msg); Dmsg1(500, "Fileset: %s\n", dir->msg); add_fileset(jcr, dir->msg); @@ -1083,7 +1163,7 @@ static int fileset_cmd(JCR *jcr) if (!term_fileset(jcr)) { return 0; } - return bnet_fsend(dir, OKinc); + return dir->fsend(OKinc); } static void free_bootstrap(JCR *jcr) @@ -1126,15 +1206,15 @@ static int bootstrap_cmd(JCR *jcr) * Suck up what he is sending to us so that he will then * read our error message. */ - while (bnet_recv(dir) >= 0) + while (dir->recv() >= 0) { } free_bootstrap(jcr); set_jcr_job_status(jcr, JS_ErrorTerminated); return 0; } - while (bnet_recv(dir) >= 0) { - Dmsg1(200, "filedmsg); + while (dir->recv() >= 0) { + Dmsg1(200, "filedmsg); fputs(dir->msg, bs); } fclose(bs); @@ -1142,7 +1222,7 @@ static int bootstrap_cmd(JCR *jcr) * Note, do not free the bootstrap yet -- it needs to be * sent to the SD */ - return bnet_fsend(dir, OKbootstrap); + return dir->fsend(OKbootstrap); } @@ -1157,24 +1237,27 @@ static int level_cmd(JCR *jcr) int mtime_only; level = get_memory(dir->msglen+1); - Dmsg1(110, "level_cmd: %s", dir->msg); + Dmsg1(100, "level_cmd: %s", dir->msg); + if (strstr(dir->msg, "accurate")) { + jcr->accurate = true; + } if (sscanf(dir->msg, "level = %s ", level) != 1) { goto bail_out; } /* Base backup requested? */ if (strcmp(level, "base") == 0) { - jcr->JobLevel = L_BASE; + jcr->set_JobLevel(L_BASE); /* Full backup requested? */ } else if (strcmp(level, "full") == 0) { - jcr->JobLevel = L_FULL; - } else if (strcmp(level, "differential") == 0) { - jcr->JobLevel = L_DIFFERENTIAL; + jcr->set_JobLevel(L_FULL); + } else if (strstr(level, "differential")) { + jcr->set_JobLevel(L_DIFFERENTIAL); free_memory(level); return 1; - } else if (strcmp(level, "incremental") == 0) { - jcr->JobLevel = L_INCREMENTAL; + } else if (strstr(level, "incremental")) { + jcr->set_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. @@ -1183,15 +1266,15 @@ static int level_cmd(JCR *jcr) 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 (jcr->get_JobLevel() == L_NONE) { + jcr->set_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; } since_time = str_to_uint64(buf); /* this is the since time */ - Dmsg1(100, "since_time=%d\n", (int)since_time); + Dmsg1(100, "since_time=%lld\n", since_time); char ed1[50], ed2[50]; /* * Sync clocks by polling him for the time. We take @@ -1199,8 +1282,8 @@ static int level_cmd(JCR *jcr) */ 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 */ + dir->signal(BNET_BTIME); /* poll for time */ + if (dir->recv() <= 0) { /* get response */ goto bail_out; } if (sscanf(dir->msg, "btime %s", buf) != 1) { @@ -1229,13 +1312,14 @@ static int level_cmd(JCR *jcr) } else { type = M_INFO; } - Jmsg(jcr, type, 0, _("DIR and FD clocks differ by %d seconds, FD automatically compensating.\n"), adj); + Jmsg(jcr, type, 0, _("DIR and FD clocks differ by %lld 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); + Dmsg2(100, "adj=%lld since_time=%lld\n", adj, since_time); jcr->incremental = 1; /* set incremental or decremental backup */ - jcr->mtime = (time_t)since_time; /* set since time */ + jcr->mtime = since_time; /* set since time */ + generate_plugin_event(jcr, bEventSince, (void *)(time_t)jcr->mtime); } else { Jmsg1(jcr, M_FATAL, 0, _("Unknown backup level: %s\n"), level); free_memory(level); @@ -1245,7 +1329,8 @@ static int level_cmd(JCR *jcr) if (buf) { free_memory(buf); } - return bnet_fsend(dir, OKlevel); + generate_plugin_event(jcr, bEventLevel, (void *)jcr->get_JobLevel()); + return dir->fsend(OKlevel); bail_out: pm_strcpy(jcr->errmsg, dir->msg); @@ -1274,7 +1359,7 @@ static int session_cmd(JCR *jcr) return 0; } - return bnet_fsend(dir, OKsession); + return dir->fsend(OKsession); } /* @@ -1286,25 +1371,31 @@ static int storage_cmd(JCR *jcr) 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 = new_bsock(); /* storage daemon bsock */ Dmsg1(100, "StorageCmd: %s", dir->msg); if (sscanf(dir->msg, storaddr, &jcr->stored_addr, &stored_port, &enable_ssl) != 3) { pm_strcpy(jcr->errmsg, dir->msg); Jmsg(jcr, M_FATAL, 0, _("Bad storage command: %s"), jcr->errmsg); - return 0; + goto bail_out; } 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, me->heartbeat_interval, - _("Storage daemon"), jcr->stored_addr, NULL, stored_port, 1); + + sd->set_source_address(me->FDsrc_addr); + if (!sd->connect(jcr, 10, (int)me->SDConnectTimeout, me->heartbeat_interval, + _("Storage daemon"), jcr->stored_addr, NULL, stored_port, 1)) { + sd->destroy(); + sd = NULL; + } + if (sd == NULL) { Jmsg(jcr, M_FATAL, 0, _("Failed to connect to Storage daemon: %s:%d\n"), jcr->stored_addr, stored_port); Dmsg2(100, "Failed to connect to Storage daemon: %s:%d\n", jcr->stored_addr, stored_port); - return 0; + goto bail_out; } Dmsg0(110, "Connection OK to SD.\n"); @@ -1313,12 +1404,17 @@ static int storage_cmd(JCR *jcr) 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; + goto bail_out; } Dmsg0(110, "Authenticated with SD.\n"); /* Send OK to Director */ return dir->fsend(OKstore); + +bail_out: + dir->fsend(BADcmd, "storage"); + return 0; + } @@ -1331,36 +1427,35 @@ static int backup_cmd(JCR *jcr) BSOCK *sd = jcr->store_bsock; int ok = 0; int SDJobStatus; - char ed1[50], ed2[50]; - bool bDoVSS = false; #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. - bDoVSS = g_pVSSClient && enable_vss; - if (bDoVSS) { + 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; + jcr->set_JobType(JT_BACKUP); Dmsg1(100, "begin backup ff=%p\n", jcr->ff); if (sd == NULL) { Jmsg(jcr, M_FATAL, 0, _("Cannot contact Storage daemon\n")); + dir->fsend(BADcmd, "backup"); goto cleanup; } - bnet_fsend(dir, OKbackup); - Dmsg1(110, "bfiled>dird: %s", dir->msg); + dir->fsend(OKbackup); + Dmsg1(110, "filed>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 @@ -1380,7 +1475,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); /* @@ -1392,10 +1487,11 @@ static int backup_cmd(JCR *jcr) } generate_daemon_event(jcr, "JobStart"); + generate_plugin_event(jcr, bEventStartBackupJob); #if defined(WIN32_VSS) - /* START VSS ON WIN 32 */ - if (bDoVSS) { + /* START VSS ON WIN32 */ + if (jcr->VSS) { if (g_pVSSClient->InitializeForBackup()) { /* tell vss which drives to snapshot */ char szWinDriveLetters[27]; @@ -1403,21 +1499,21 @@ static int backup_cmd(JCR *jcr) 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++; + jcr->JobErrors++; } 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++; + jcr->JobErrors++; } } /* 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++; + jcr->JobErrors++; } } } else { @@ -1427,6 +1523,7 @@ static int backup_cmd(JCR *jcr) berrno be; Jmsg(jcr, M_WARNING, 0, _("VSS was not initialized properly. VSS support is disabled. ERR=%s\n"), be.bstrerror()); } + run_scripts(jcr, jcr->RunScripts, "ClientAfterVSS"); } #endif @@ -1441,8 +1538,8 @@ static int backup_cmd(JCR *jcr) Dmsg0(110, "Error in blast_data.\n"); } else { set_jcr_job_status(jcr, JS_Terminated); - - if (jcr->JobStatus != JS_Terminated) { + /* Note, the above set status will not override an error */ + if (!(jcr->JobStatus == JS_Terminated || jcr->JobStatus == JS_Warnings)) { bnet_suppress_error_messages(sd, 1); goto cleanup; /* bail out now */ } @@ -1457,7 +1554,7 @@ static int backup_cmd(JCR *jcr) /* * 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); @@ -1467,7 +1564,7 @@ static int backup_cmd(JCR *jcr) /* * 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; @@ -1478,7 +1575,7 @@ static int backup_cmd(JCR *jcr) Jmsg(jcr, M_FATAL, 0, _("Append Close with SD failed.\n")); goto cleanup; } - if (SDJobStatus != JS_Terminated) { + if (!(SDJobStatus == JS_Terminated || SDJobStatus == JS_Warnings)) { Jmsg(jcr, M_FATAL, 0, _("Bad status %d returned from Storage Daemon.\n"), SDJobStatus); } @@ -1486,30 +1583,26 @@ static int backup_cmd(JCR *jcr) cleanup: #if defined(WIN32_VSS) - /* STOP VSS ON WIN 32 */ + /* STOP VSS ON WIN32 */ /* tell vss to close the backup session */ - if (bDoVSS) { + 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++; + jcr->JobErrors++; } Jmsg(jcr, msg_type, 0, _("VSS Writer (BackupComplete): %s\n"), g_pVSSClient->GetWriterInfo(i)); } } + Win32ConvCleanupCache(); V(vss_mutex); } #endif - bnet_fsend(dir, EndJob, jcr->JobStatus, jcr->JobFiles, - edit_uint64(jcr->ReadBytes, ed1), - edit_uint64(jcr->JobBytes, ed2), jcr->Errors, (int)bDoVSS, - jcr->pki_encrypt); - Dmsg1(110, "End FD msg: %s\n", dir->msg); - + generate_plugin_event(jcr, bEventEndBackupJob); return 0; /* return and stop command loop */ } @@ -1521,36 +1614,38 @@ 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; + jcr->set_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; + jcr->set_JobLevel(L_VERIFY_INIT); } else if (strcasecmp(level, "catalog") == 0){ - jcr->JobLevel = L_VERIFY_CATALOG; + jcr->set_JobLevel(L_VERIFY_CATALOG); } else if (strcasecmp(level, "volume") == 0){ - jcr->JobLevel = L_VERIFY_VOLUME_TO_CATALOG; + jcr->set_JobLevel(L_VERIFY_VOLUME_TO_CATALOG); } else if (strcasecmp(level, "data") == 0){ - jcr->JobLevel = L_VERIFY_DATA; + jcr->set_JobLevel(L_VERIFY_DATA); } else if (strcasecmp(level, "disk_to_catalog") == 0) { - jcr->JobLevel = L_VERIFY_DISK_TO_CATALOG; + jcr->set_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->get_JobLevel()); + generate_plugin_event(jcr, bEventStartVerifyJob); - Dmsg1(110, "bfiled>dird: %s", dir->msg); + Dmsg1(110, "filed>dird: %s", dir->msg); - switch (jcr->JobLevel) { + switch (jcr->get_JobLevel()) { case L_VERIFY_INIT: case L_VERIFY_CATALOG: do_verify(jcr); @@ -1565,35 +1660,26 @@ static int verify_cmd(JCR *jcr) /* * Send Close session command to Storage daemon */ - bnet_fsend(sd, read_close, jcr->Ticket); - Dmsg1(130, "bfiled>stored: %s", sd->msg); + sd->fsend(read_close, jcr->Ticket); + Dmsg1(130, "filed>stored: %s", sd->msg); /* ****FIXME**** check response */ 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, 0, - jcr->pki_encrypt); - Dmsg1(110, "End FD msg: %s\n", dir->msg); - - /* Inform Director that we are done */ - bnet_sig(dir, BNET_TERMINATE); + dir->signal(BNET_EOD); + generate_plugin_event(jcr, bEventEndVerifyJob); return 0; /* return and terminate command loop */ } @@ -1609,7 +1695,6 @@ static int restore_cmd(JCR *jcr) bool use_regexwhere=false; int prefix_links; char replace; - char ed1[50], ed2[50]; /* * Scan WHERE (base directory for restore) from command @@ -1653,10 +1738,10 @@ static int restore_cmd(JCR *jcr) jcr->replace = replace; jcr->prefix_links = prefix_links; - bnet_fsend(dir, OKrestore); - Dmsg1(110, "bfiled>dird: %s", dir->msg); + dir->fsend(OKrestore); + Dmsg1(110, "filed>dird: %s", dir->msg); - jcr->JobType = JT_RESTORE; + jcr->set_JobType(JT_RESTORE); set_jcr_job_status(jcr, JS_Blocked); @@ -1672,6 +1757,7 @@ static int restore_cmd(JCR *jcr) */ start_dir_heartbeat(jcr); generate_daemon_event(jcr, "JobStart"); + generate_plugin_event(jcr, bEventStartRestoreJob); do_restore(jcr); stop_dir_heartbeat(jcr); @@ -1683,30 +1769,22 @@ static int restore_cmd(JCR *jcr) /* * Send Close session command to Storage daemon */ - bnet_fsend(sd, read_close, jcr->Ticket); - Dmsg1(130, "bfiled>stored: %s", sd->msg); + sd->fsend(read_close, jcr->Ticket); + Dmsg1(130, "filed>stored: %s", sd->msg); 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) { + if (jcr->JobErrors) { 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, 0, - jcr->pki_encrypt); - Dmsg1(110, "End FD msg: %s\n", dir->msg); - - /* Inform Director that we are done */ - bnet_sig(dir, BNET_TERMINATE); Dmsg0(130, "Done in job.c\n"); + generate_plugin_event(jcr, bEventEndRestoreJob); return 0; /* return and terminate command loop */ } @@ -1724,7 +1802,7 @@ static int open_sd_read_session(JCR *jcr) /* * Open Read Session with Storage daemon */ - bnet_fsend(sd, read_open, "DummyVolume", + sd->fsend(read_open, "DummyVolume", jcr->VolSessionId, jcr->VolSessionTime, jcr->StartFile, jcr->EndFile, jcr->StartBlock, jcr->EndBlock); Dmsg1(110, ">stored: %s", sd->msg); @@ -1733,12 +1811,12 @@ static int open_sd_read_session(JCR *jcr) * Get ticket number */ if (bget_msg(sd) >= 0) { - Dmsg1(110, "bfiledmsg); + Dmsg1(110, "filedmsg); 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; } - Dmsg1(110, "bfiled: got Ticket=%d\n", jcr->Ticket); + Dmsg1(110, "filed: got Ticket=%d\n", jcr->Ticket); } else { Jmsg(jcr, M_FATAL, 0, _("Bad response from stored to read open command\n")); return 0; @@ -1751,7 +1829,7 @@ static int open_sd_read_session(JCR *jcr) /* * Start read of data with Storage daemon */ - bnet_fsend(sd, read_data, jcr->Ticket); + sd->fsend(read_data, jcr->Ticket); Dmsg1(110, ">stored: %s", sd->msg); /* @@ -1770,7 +1848,7 @@ static int open_sd_read_session(JCR *jcr) static void filed_free_jcr(JCR *jcr) { if (jcr->store_bsock) { - bnet_close(jcr->store_bsock); + jcr->store_bsock->close(); } free_bootstrap(jcr); if (jcr->last_fname) { @@ -1779,6 +1857,9 @@ static void filed_free_jcr(JCR *jcr) 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; } @@ -1834,12 +1915,12 @@ static int send_bootstrap_file(JCR *jcr) goto bail_out; } sd->msglen = pm_strcpy(sd->msg, bootstrap); - bnet_send(sd); + sd->send(); while (fgets(buf, sizeof(buf), bs)) { sd->msglen = Mmsg(sd->msg, "%s", buf); - bnet_send(sd); + sd->send(); } - bnet_sig(sd, BNET_EOD); + sd->signal(BNET_EOD); fclose(bs); if (!response(jcr, sd, OKSDbootstrap, "Bootstrap")) { set_jcr_job_status(jcr, JS_ErrorTerminated);