X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Ffiled%2Fjob.c;h=4a224cd68f9591969de13dece0780ee4c9943ff8;hb=cbfe8e1c9fd311e7ed6d102b35996a31a6e95497;hp=4e697c1b7b003886f87edabdf135c18bf3b62263;hpb=e962180b2337f069bea41869cfa913fe5ca2dc86;p=bacula%2Fbacula diff --git a/bacula/src/filed/job.c b/bacula/src/filed/job.c index 4e697c1b7b..4a224cd68f 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-2008 Free Software Foundation Europe e.V. + Copyright (C) 2000-2010 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. @@ -30,8 +30,6 @@ * * Kern Sibbald, October MM * - * Version $Id$ - * */ #include "bacula.h" @@ -41,7 +39,23 @@ #include "vss.h" static pthread_mutex_t vss_mutex = PTHREAD_MUTEX_INITIALIZER; -static int enable_vss; +static int enable_vss = 0; +#endif + +/** + * As Windows saves ACLs as part of the standard backup stream + * we just pretend here that is has implicit acl support. + */ +#if defined(HAVE_ACL) || defined(HAVE_WIN32) +const bool have_acl = true; +#else +const bool have_acl = false; +#endif + +#if defined(HAVE_XATTR) +const bool have_xattr = true; +#else +const bool have_xattr = false; #endif extern CLIENT *me; /* our client resource */ @@ -49,6 +63,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); @@ -62,6 +77,7 @@ static int fileset_cmd(JCR *jcr); static int level_cmd(JCR *jcr); static int verify_cmd(JCR *jcr); static int restore_cmd(JCR *jcr); +static int end_restore_cmd(JCR *jcr); static int storage_cmd(JCR *jcr); static int session_cmd(JCR *jcr); static int response(JCR *jcr, BSOCK *sd, char *resp, const char *cmd); @@ -72,8 +88,9 @@ static int runscript_cmd(JCR *jcr); static int runbefore_cmd(JCR *jcr); static int runafter_cmd(JCR *jcr); static int runbeforenow_cmd(JCR *jcr); +static int restore_object_cmd(JCR *jcr); static void set_options(findFOPTS *fo, const char *opts); - +static void set_storage_auth_key(JCR *jcr, char *key); /* Exported functions */ @@ -83,7 +100,7 @@ struct s_cmds { int monitoraccess; /* specify if monitors have access to this function */ }; -/* +/** * The following are the recognized commands from the Director. */ static struct s_cmds cmds[] = { @@ -95,7 +112,8 @@ static struct s_cmds cmds[] = { {"fileset", fileset_cmd, 0}, {"JobId=", job_cmd, 0}, {"level = ", level_cmd, 0}, - {"restore", restore_cmd, 0}, + {"restore ", restore_cmd, 0}, + {"endrestore", end_restore_cmd, 0}, {"session", session_cmd, 0}, {"status", status_cmd, 1}, {".status", qstatus_cmd, 1}, @@ -106,16 +124,21 @@ static struct s_cmds cmds[] = { {"RunBeforeJob", runbefore_cmd, 0}, {"RunAfterJob", runafter_cmd, 0}, {"Run", runscript_cmd, 0}, + {"accurate", accurate_cmd, 0}, + {"restoreobject", restore_object_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"; +static char storaddr[] = "storage address=%s port=%d ssl=%d Authorization=%100s"; +static char storaddr_v1[] = "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 restorecmdR[] = "restore replace=%c prelinks=%d regexwhere=%s\n"; +static char restoreobjcmd[] = "restoreobject JobId=%u ObjLen=%d ObjInx=%d ObjType=%d FI=%d\n"; +static char endrestoreobjectcmd[] = "restoreobject end\n"; static char verifycmd[] = "verify level=%30s"; static char estimatecmd[] = "estimate listing=%d"; static char runbefore[] = "RunBeforeJob %s"; @@ -127,7 +150,7 @@ static char errmsg[] = "2999 Invalid command\n"; static char no_auth[] = "2998 No Authorization\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 OKest[] = "2000 OK estimate files=%s bytes=%s\n"; static char OKlevel[] = "2000 OK level\n"; static char OKbackup[] = "2000 OK backup\n"; static char OKbootstrap[] = "2000 OK bootstrap\n"; @@ -135,6 +158,7 @@ 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 OKstoreend[] = "2000 OK storage end\n"; 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"; @@ -144,6 +168,8 @@ 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"; +static char OKRestoreObject[] = "2000 OK ObjectRestored\n"; /* Responses received from Storage Daemon */ @@ -164,7 +190,7 @@ static char read_open[] = "read open session = %s %ld %ld %ld %ld %ld %ld\n"; static char read_data[] = "read data %d\n"; static char read_close[] = "read close session %d\n"; -/* +/** * Accept requests from a Director * * NOTE! We are running as a separate thread @@ -193,7 +219,7 @@ static char read_close[] = "read close session %d\n"; * 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) + * 8. SD/FD disconnects while SD despools data and attributes (optional) * 9. FD runs ClientRunAfterJob */ @@ -203,30 +229,33 @@ void *handle_client_request(void *dirp) bool found, quit; JCR *jcr; BSOCK *dir = (BSOCK *)dirp; + const char jobname[12] = "*Director*"; +// saveCWD save_cwd; jcr = new_jcr(sizeof(JCR), filed_free_jcr); /* create JCR */ jcr->dir_bsock = dir; jcr->ff = init_find_files(); +// save_cwd.save(jcr); 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); 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 +265,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,7 +292,7 @@ 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 */ @@ -272,19 +301,22 @@ void *handle_client_request(void *dirp) 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, + dir->fsend(EndJob, jcr->JobStatus, jcr->JobFiles, edit_uint64(jcr->ReadBytes, ed1), - edit_uint64(jcr->JobBytes, ed2), jcr->Errors, jcr->VSS, - jcr->pki_encrypt); + 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; @@ -299,6 +331,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(); @@ -309,15 +347,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); - } } incexe->opts_list.destroy(); incexe->name_list.destroy(); + incexe->plugin_list.destroy(); + if (incexe->ignoredir) { + free(incexe->ignoredir); + } } fileset->include_list.destroy(); @@ -339,6 +375,10 @@ void *handle_client_request(void *dirp) } incexe->opts_list.destroy(); incexe->name_list.destroy(); + incexe->plugin_list.destroy(); + if (incexe->ignoredir) { + free(incexe->ignoredir); + } } fileset->exclude_list.destroy(); free(fileset); @@ -346,6 +386,8 @@ void *handle_client_request(void *dirp) ff->fileset = NULL; Dmsg0(100, "Calling term_find_files\n"); term_find_files(jcr->ff); +// save_cwd.restore(jcr); +// save_cwd.release(); jcr->ff = NULL; Dmsg0(100, "Done with term_find_files\n"); free_jcr(jcr); /* destroy JCR record */ @@ -354,7 +396,7 @@ void *handle_client_request(void *dirp) return NULL; } -/* +/** * Hello from Director he must identify himself and provide his * password. */ @@ -369,7 +411,7 @@ static int hello_cmd(JCR *jcr) return 1; } -/* +/** * Cancel a Job */ static int cancel_cmd(JCR *jcr) @@ -387,6 +429,7 @@ static int cancel_cmd(JCR *jcr) 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); dir->fsend(_("2001 Job %s marked to be canceled.\n"), Job); @@ -399,7 +442,7 @@ static int cancel_cmd(JCR *jcr) } -/* +/** * Set debug level as requested by the Director * */ @@ -423,7 +466,7 @@ static int setdebug_cmd(JCR *jcr) static int estimate_cmd(JCR *jcr) { BSOCK *dir = jcr->dir_bsock; - char ed2[50]; + char ed1[50], ed2[50]; if (sscanf(dir->msg, estimatecmd, &jcr->listing) != 1) { pm_strcpy(jcr->errmsg, dir->msg); @@ -432,33 +475,34 @@ static int estimate_cmd(JCR *jcr) return 0; } make_estimate(jcr); - dir->fsend(OKest, jcr->num_files_examined, + dir->fsend(OKest, edit_uint64_with_commas(jcr->num_files_examined, ed1), edit_uint64_with_commas(jcr->JobBytes, ed2)); dir->signal(BNET_EOD); return 1; } -/* +/** * Get JobId and Storage Daemon Authorization key from Director */ static int job_cmd(JCR *jcr) { BSOCK *dir = jcr->dir_bsock; - POOLMEM *sd_auth_key; + POOL_MEM sd_auth_key(PM_MESSAGE); + sd_auth_key.check_size(dir->msglen); - 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.c_str()) != 5) { pm_strcpy(jcr->errmsg, dir->msg); Jmsg(jcr, M_FATAL, 0, _("Bad Job Command: %s"), jcr->errmsg); 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); + set_storage_auth_key(jcr, sd_auth_key.c_str()); 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); } @@ -576,6 +620,71 @@ static int runscript_cmd(JCR *jcr) } +static int restore_object_cmd(JCR *jcr) +{ + BSOCK *dir = jcr->dir_bsock; + POOLMEM *msg = get_memory(dir->msglen+1); + int32_t FileIndex; + restore_object_pkt rop; + + memset(&rop, 0, sizeof(rop)); + rop.pkt_size = sizeof(rop); + rop.pkt_end = sizeof(rop); + Dmsg1(100, "Enter restoreobject_cmd: %s", dir->msg); + if (strcmp(dir->msg, endrestoreobjectcmd) == 0) { + generate_plugin_event(jcr, bEventRestoreObject, NULL); + free_memory(msg); + return dir->fsend(OKRestoreObject); + } + + if (sscanf(dir->msg, restoreobjcmd, &rop.JobId, &rop.object_len, + &rop.object_index, &rop.object_type, &FileIndex) != 5) { + Dmsg0(5, "Bad restore object command\n"); + pm_strcpy(jcr->errmsg, dir->msg); + Jmsg1(jcr, M_FATAL, 0, _("Bad RestoreObject command: %s\n"), jcr->errmsg); + goto bail_out; + } + +// Dmsg5(000, "Recv object: JobId=%u objlen=%d objinx=%d objtype=%d FI=%d\n", +// JobId, object_len, object_index, object_type, FileIndex); + /* Read Object name */ + if (dir->recv() < 0) { + goto bail_out; + } +// Dmsg2(000, "Recv Fname object: len=%d Oname=%s\n", dir->msglen, dir->msg); + rop.object_name = bstrdup(dir->msg); + +// Dmsg2(000, "Recv Path object: len=%d Path=%s\n", dir->msglen, dir->msg); + + /* Read Object */ + if (dir->recv() < 0) { + goto bail_out; + } + rop.object = dir->msg; +// Dmsg2(000, "Recv Object: len=%d Object=%s\n", dir->msglen, dir->msg); + + /* pass to plugin */ + generate_plugin_event(jcr, bEventRestoreObject, (void *)&rop); + + if (rop.object_name) { + free(rop.object_name); + } + if (!rop.object) { + dir->msg = get_pool_memory(PM_MESSAGE); + } + + free_memory(msg); + Dmsg1(100, "Send: %s", OKRestoreObject); + return 1; + +bail_out: + dir->fsend(_("2909 Bad RestoreObject command.\n")); + free_memory(msg); + return 0; + +} + + static bool init_fileset(JCR *jcr) { FF_PKT *ff; @@ -623,11 +732,12 @@ 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) +void add_file_to_fileset(JCR *jcr, const char *fname, findFILESET *fileset, + bool is_file) { char *p; BPIPE *bpipe; @@ -655,7 +765,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; @@ -665,7 +779,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; @@ -676,16 +790,47 @@ 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; } } +/** + * Define a new Exclude block in the FileSet + */ +findFILESET *new_exclude(JCR *jcr) +{ + FF_PKT *ff = jcr->ff; + findFILESET *fileset = ff->fileset; + + /* New exclude */ + fileset->incexe = (findINCEXE *)malloc(sizeof(findINCEXE)); + 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); + return fileset; +} + static void add_fileset(JCR *jcr, const char *item) { @@ -715,7 +860,7 @@ static void add_fileset(JCR *jcr, const char *item) return; } - /* + /** * The switch tests the code for validity. * The subcode is always good if it is a space, otherwise we must confirm. * We set state to state_error first assuming the subcode is invalid, @@ -723,7 +868,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': @@ -732,23 +877,24 @@ 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': - /* New exclude */ - fileset->incexe = (findINCEXE *)malloc(sizeof(findINCEXE)); - memset(fileset->incexe, 0, sizeof(findINCEXE)); - fileset->incexe->opts_list.init(1, true); - fileset->incexe->name_list.init(); - fileset->exclude_list.append(fileset->incexe); + fileset = new_exclude(jcr); 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); + 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, false); break; case 'R': current_opts = start_options(ff); @@ -816,14 +962,18 @@ static void add_fileset(JCR *jcr, const char *item) set_options(current_opts, item); state = state_options; break; + case 'Z': + state = state_include; + fileset->incexe->ignoredir = bstrdup(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: @@ -877,17 +1027,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 (incexe->ignoredir) { + Dmsg1(400, "Z %s\n", incexe->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); @@ -929,13 +1079,16 @@ 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; } -/* +/** * As an optimization, we should do this during * "compile" time in filed/job.c, and keep only a bit mask * and the Verify options. @@ -1035,6 +1188,26 @@ 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 'J': /* Basejob options */ + /* Copy BaseJob Options */ + for (j=0; *p && *p != ':'; p++) { + fo->BaseJobOpts[j] = *p; + if (j < (int)sizeof(fo->BaseJobOpts) - 1) { + j++; + } + } + fo->BaseJobOpts[j] = 0; + break; case 'P': /* strip path */ /* Get integer */ p++; /* skip P */ @@ -1065,6 +1238,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; @@ -1073,7 +1252,7 @@ static void set_options(findFOPTS *fo, const char *opts) } -/* +/** * Director is passing his Fileset */ static int fileset_cmd(JCR *jcr) @@ -1098,7 +1277,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) @@ -1114,9 +1293,11 @@ static void free_bootstrap(JCR *jcr) 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. + * Deprecated. The bsr is now sent directly from the + * Director to the SD. */ static int bootstrap_cmd(JCR *jcr) { @@ -1149,7 +1330,7 @@ static int bootstrap_cmd(JCR *jcr) } while (dir->recv() >= 0) { - Dmsg1(200, "filedmsg); + Dmsg1(200, "filedmsg); fputs(dir->msg, bs); } fclose(bs); @@ -1161,7 +1342,7 @@ static int bootstrap_cmd(JCR *jcr) } -/* +/** * Get backup level from Director * */ @@ -1172,24 +1353,29 @@ 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); + + /* keep compatibility with older directors */ + 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. @@ -1198,15 +1384,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->getJobLevel() == 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 @@ -1244,13 +1430,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); } 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); @@ -1260,6 +1447,7 @@ static int level_cmd(JCR *jcr) if (buf) { free_memory(buf); } + generate_plugin_event(jcr, bEventLevel, (void *)jcr->getJobLevel()); return dir->fsend(OKlevel); bail_out: @@ -1272,8 +1460,9 @@ bail_out: return 0; } -/* +/** * Get session parameters from Director -- this is for a Restore command + * This is deprecated. It is now passed via the bsr. */ static int session_cmd(JCR *jcr) { @@ -1289,10 +1478,44 @@ static int session_cmd(JCR *jcr) return 0; } - return bnet_fsend(dir, OKsession); + return dir->fsend(OKsession); } -/* +static void set_storage_auth_key(JCR *jcr, char *key) +{ + /* if no key don't update anything */ + if (!*key) { + return; + } + + /** + * We can be contacting multiple storage daemons. + * So, make sure that any old jcr->store_bsock is cleaned up. + */ + if (jcr->store_bsock) { + jcr->store_bsock->destroy(); + jcr->store_bsock = NULL; + } + + /** + * We can be contacting multiple storage daemons. + * So, make sure that any old jcr->sd_auth_key is cleaned up. + */ + if (jcr->sd_auth_key) { + /* + * If we already have a Authorization key, director can do multi + * storage restore + */ + Dmsg0(5, "set multi_restore=true\n"); + jcr->multi_restore = true; + bfree(jcr->sd_auth_key); + } + + jcr->sd_auth_key = bstrdup(key); + Dmsg0(5, "set sd auth key\n"); +} + +/** * Get address of storage daemon from Director * */ @@ -1300,26 +1523,43 @@ static int storage_cmd(JCR *jcr) { int stored_port; /* storage daemon port */ int enable_ssl; /* enable ssl to sd */ + POOL_MEM sd_auth_key(PM_MESSAGE); 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; + sd_auth_key.check_size(dir->msglen); + if (sscanf(dir->msg, storaddr, &jcr->stored_addr, &stored_port, + &enable_ssl, sd_auth_key.c_str()) != 4) { + if (sscanf(dir->msg, storaddr_v1, &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); + goto bail_out; + } } - Dmsg3(110, "Open storage: %s:%d ssl=%d\n", jcr->stored_addr, stored_port, enable_ssl); + + set_storage_auth_key(jcr, sd_auth_key.c_str()); + + 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"); @@ -1328,16 +1568,21 @@ 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; + } -/* +/** * Do a backup. */ static int backup_cmd(JCR *jcr) @@ -1358,24 +1603,38 @@ static int backup_cmd(JCR *jcr) } #endif + /** + * Validate some options given to the backup make sense for the compiled in + * options of this filed. + */ + if (jcr->ff->flags & FO_ACL && !have_acl) { + Jmsg(jcr, M_FATAL, 0, _("ACL support not configured for your machine.\n")); + goto cleanup; + } + if (jcr->ff->flags & FO_XATTR && !have_xattr) { + Jmsg(jcr, M_FATAL, 0, _("XATTR support not configured for your machine.\n")); + goto cleanup; + } + 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; } dir->fsend(OKbackup); - Dmsg1(110, "bfiled>dird: %s", dir->msg); + Dmsg1(110, "filed>dird: %s", dir->msg); - /* + /** * Send Append Open Session to Storage daemon */ sd->fsend(append_open); Dmsg1(110, ">stored: %s", sd->msg); - /* + /** * Expect to receive back the Ticket number */ if (bget_msg(sd) >= 0) { @@ -1390,13 +1649,13 @@ static int backup_cmd(JCR *jcr) goto cleanup; } - /* + /** * Send Append data command to Storage daemon */ sd->fsend(append_data, jcr->Ticket); Dmsg1(110, ">stored: %s", sd->msg); - /* + /** * Expect to get OK data */ Dmsg1(110, "msg); @@ -1405,32 +1664,34 @@ 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 */ + /* START VSS ON WIN32 */ if (jcr->VSS) { - if (g_pVSSClient->InitializeForBackup()) { + if (g_pVSSClient->InitializeForBackup(jcr)) { + generate_plugin_event(jcr, bEventVssBackupAddComponents); /* 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++; + 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 { @@ -1440,26 +1701,26 @@ 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 - /* + /** * Send Files to Storage daemon */ Dmsg1(110, "begin blast ff=%p\n", (FF_PKT *)jcr->ff); 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) { + /* 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 */ } - /* + /** * Expect to get response to append_data from Storage daemon */ if (!response(jcr, sd, OK_append, "Append Data")) { @@ -1467,7 +1728,7 @@ static int backup_cmd(JCR *jcr) goto cleanup; } - /* + /** * Send Append End Data to Storage daemon */ sd->fsend(append_end, jcr->Ticket); @@ -1477,7 +1738,7 @@ static int backup_cmd(JCR *jcr) goto cleanup; } - /* + /** * Send Append Close to Storage daemon */ sd->fsend(append_close, jcr->Ticket); @@ -1491,7 +1752,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); } @@ -1499,28 +1760,17 @@ static int backup_cmd(JCR *jcr) cleanup: #if defined(WIN32_VSS) - /* STOP VSS ON WIN 32 */ - /* 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)); - } - } + Win32ConvCleanupCache(); V(vss_mutex); } #endif + generate_plugin_event(jcr, bEventEndBackupJob); return 0; /* return and stop command loop */ } -/* +/** * Do a Verify for Director * */ @@ -1530,22 +1780,22 @@ static int verify_cmd(JCR *jcr) BSOCK *sd = jcr->store_bsock; char level[100]; - jcr->JobType = JT_VERIFY; + jcr->set_JobType(JT_VERIFY); if (sscanf(dir->msg, verifycmd, level) != 1) { 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 { dir->fsend(_("2994 Bad verify level: %s\n"), dir->msg); return 0; @@ -1554,10 +1804,12 @@ static int verify_cmd(JCR *jcr) dir->fsend(OKverify); generate_daemon_event(jcr, "JobStart"); + generate_plugin_event(jcr, bEventLevel, (void *)jcr->getJobLevel()); + generate_plugin_event(jcr, bEventStartVerifyJob); - Dmsg1(110, "bfiled>dird: %s", dir->msg); + Dmsg1(110, "filed>dird: %s", dir->msg); - switch (jcr->JobLevel) { + switch (jcr->getJobLevel()) { case L_VERIFY_INIT: case L_VERIFY_CATALOG: do_verify(jcr); @@ -1573,7 +1825,7 @@ static int verify_cmd(JCR *jcr) * Send Close session command to Storage daemon */ sd->fsend(read_close, jcr->Ticket); - Dmsg1(130, "bfiled>stored: %s", sd->msg); + Dmsg1(130, "filed>stored: %s", sd->msg); /* ****FIXME**** check response */ bget_msg(sd); /* get OK */ @@ -1591,11 +1843,28 @@ static int verify_cmd(JCR *jcr) } dir->signal(BNET_EOD); - + generate_plugin_event(jcr, bEventEndVerifyJob); return 0; /* return and terminate command loop */ } -/* +#ifdef WIN32_VSS +static bool vss_restore_init_callback(JCR *jcr, int init_type) +{ + switch (init_type) { + case VSS_INIT_RESTORE_AFTER_INIT: + generate_plugin_event(jcr, bEventVssRestoreLoadComponentMetadata); + return true; + case VSS_INIT_RESTORE_AFTER_GATHER: + generate_plugin_event(jcr, bEventVssRestoreSetComponentsSelected); + return true; + default: + return false; + break; + } +} +#endif + +/** * Do a Restore for Director * */ @@ -1608,10 +1877,25 @@ static int restore_cmd(JCR *jcr) int prefix_links; char replace; - /* + /** * Scan WHERE (base directory for restore) from command */ - Dmsg0(150, "restore command\n"); + Dmsg0(100, "restore command\n"); +#if defined(WIN32_VSS) + + /* TODO: this should be given from the director */ + enable_vss = 1; + + Dmsg2(50, "g_pVSSClient = %p, enable_vss = %d\n", g_pVSSClient, enable_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 /* Pickup where string */ args = get_memory(dir->msglen+1); *args = 0; @@ -1650,10 +1934,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); @@ -1664,11 +1948,38 @@ static int restore_cmd(JCR *jcr) set_jcr_job_status(jcr, JS_Running); - /* + /** * Do restore of files and data */ start_dir_heartbeat(jcr); generate_daemon_event(jcr, "JobStart"); + generate_plugin_event(jcr, bEventStartRestoreJob); + +#if defined(WIN32_VSS) + /* START VSS ON WIN32 */ + if (jcr->VSS) { + if (g_pVSSClient->InitializeForRestore(jcr, vss_restore_init_callback)) { + /* inform user about writer states */ + int i; + for (i=0; i < (int)g_pVSSClient->GetWriterCount(); i++) { + int msg_type = M_INFO; + if (g_pVSSClient->GetWriterState(i) < 1) { + msg_type = M_WARNING; + jcr->JobErrors++; + } + if (g_pVSSClient->GetWriterState(i) < 1) { + Jmsg(jcr, M_WARNING, 0, _("VSS Writer (PreRestore): %s\n"), g_pVSSClient->GetWriterInfo(i)); + jcr->JobErrors++; + } + } + } else { + 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 + do_restore(jcr); stop_dir_heartbeat(jcr); @@ -1677,24 +1988,67 @@ static int restore_cmd(JCR *jcr) bnet_suppress_error_messages(sd, 1); } - /* + /** * 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(100, "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); + +#if defined(WIN32_VSS) + /* STOP VSS ON WIN32 */ + /* tell vss to close the restore session */ + Dmsg0(0, "About to call CloseRestore\n"); + if (jcr->VSS) { + Dmsg0(0, "Really about to call CloseRestore\n"); + if (g_pVSSClient->CloseRestore()) { + Dmsg0(0, "CloseRestore success\n"); + /* 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->JobErrors++; + } + Jmsg(jcr, msg_type, 0, _("VSS Writer (RestoreComplete): %s\n"), g_pVSSClient->GetWriterInfo(i)); + } + } + else + Dmsg1(0, "CloseRestore fail - %08x\n", errno); + V(vss_mutex); + } +#endif bail_out: + bfree_and_null(jcr->where); - if (jcr->Errors) { + if (jcr->JobErrors) { set_jcr_job_status(jcr, JS_ErrorTerminated); } - Dmsg0(130, "Done in job.c\n"); + Dmsg0(100, "Done in job.c\n"); + + int ret; + if (jcr->multi_restore) { + Dmsg0(100, OKstoreend); + dir->fsend(OKstoreend); + ret = 1; /* we continue the loop, waiting for next part */ + } else { + end_restore_cmd(jcr); + ret = 0; /* we stop here */ + } + + return ret; +} + +static int end_restore_cmd(JCR *jcr) +{ + Dmsg0(5, "end_restore_cmd\n"); + generate_plugin_event(jcr, bEventEndRestoreJob); return 0; /* return and terminate command loop */ } @@ -1712,7 +2066,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); @@ -1721,12 +2075,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; @@ -1739,7 +2093,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); /* @@ -1751,14 +2105,14 @@ static int open_sd_read_session(JCR *jcr) return 1; } -/* +/** * Destroy the Job Control Record and associated * resources (sockets). */ 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) { @@ -1767,10 +2121,13 @@ 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; } -/* +/** * Get response from Storage daemon to a command we * sent. Check that the response is OK. * @@ -1822,12 +2179,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);