X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Ffiled%2Fjob.c;h=4a224cd68f9591969de13dece0780ee4c9943ff8;hb=cbfe8e1c9fd311e7ed6d102b35996a31a6e95497;hp=e41d7f270b73ce730874edf309d56cd11807c99c;hpb=54b509a5eb798b03f47ebe6368c66fc9308c41ec;p=bacula%2Fbacula diff --git a/bacula/src/filed/job.c b/bacula/src/filed/job.c index e41d7f270b..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-2009 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. @@ -30,8 +30,6 @@ * * Kern Sibbald, October MM * - * Version $Id$ - * */ #include "bacula.h" @@ -44,7 +42,7 @@ static pthread_mutex_t vss_mutex = PTHREAD_MUTEX_INITIALIZER; 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. */ @@ -90,6 +88,7 @@ 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); @@ -101,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[] = { @@ -113,7 +112,7 @@ 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}, @@ -126,6 +125,7 @@ static struct s_cmds cmds[] = { {"RunAfterJob", runafter_cmd, 0}, {"Run", runscript_cmd, 0}, {"accurate", accurate_cmd, 0}, + {"restoreobject", restore_object_cmd, 0}, {NULL, NULL} /* list terminator */ }; @@ -137,6 +137,8 @@ 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"; @@ -148,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"; @@ -167,6 +169,7 @@ 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 */ @@ -187,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 @@ -227,10 +230,12 @@ void *handle_client_request(void *dirp) 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); @@ -342,13 +347,13 @@ void *handle_client_request(void *dirp) fo->base.destroy(); fo->fstype.destroy(); fo->drivetype.destroy(); - if (fo->ignoredir != NULL) { - free(fo->ignoredir); - } } incexe->opts_list.destroy(); incexe->name_list.destroy(); incexe->plugin_list.destroy(); + if (incexe->ignoredir) { + free(incexe->ignoredir); + } } fileset->include_list.destroy(); @@ -371,6 +376,9 @@ 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); @@ -378,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 */ @@ -386,7 +396,7 @@ void *handle_client_request(void *dirp) return NULL; } -/* +/** * Hello from Director he must identify himself and provide his * password. */ @@ -401,7 +411,7 @@ static int hello_cmd(JCR *jcr) return 1; } -/* +/** * Cancel a Job */ static int cancel_cmd(JCR *jcr) @@ -432,7 +442,7 @@ static int cancel_cmd(JCR *jcr) } -/* +/** * Set debug level as requested by the Director * */ @@ -456,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); @@ -465,13 +475,13 @@ 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) @@ -610,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; @@ -657,12 +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, - bool is_file) +void add_file_to_fileset(JCR *jcr, const char *fname, findFILESET *fileset, + bool is_file) { char *p; BPIPE *bpipe; @@ -738,6 +813,24 @@ static void add_file_to_fileset(JCR *jcr, const char *fname, findFILESET *filese } } +/** + * 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) { @@ -767,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, @@ -788,13 +881,7 @@ static void add_fileset(JCR *jcr, const char *item) 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->incexe->plugin_list.init(); - fileset->exclude_list.append(fileset->incexe); + fileset = new_exclude(jcr); break; case 'N': state = state_none; @@ -876,9 +963,8 @@ static void add_fileset(JCR *jcr, const char *item) state = state_options; break; case 'Z': - current_opts = start_options(ff); - current_opts->ignoredir = bstrdup(item); - state = state_options; + state = state_include; + fileset->incexe->ignoredir = bstrdup(item); break; case 'D': current_opts = start_options(ff); @@ -941,9 +1027,9 @@ static bool term_fileset(JCR *jcr) for (k=0; kdrivetype.size(); k++) { Dmsg1(400, "XD %s\n", (char *)fo->drivetype.get(k)); } - if (fo->ignoredir) { - Dmsg1(400, "Z %s\n", fo->ignoredir); - } + } + if (incexe->ignoredir) { + Dmsg1(400, "Z %s\n", incexe->ignoredir); } dlistString *node; foreach_dlist(node, &incexe->name_list) { @@ -1002,7 +1088,7 @@ static bool term_fileset(JCR *jcr) } -/* +/** * As an optimization, we should do this during * "compile" time in filed/job.c, and keep only a bit mask * and the Verify options. @@ -1112,6 +1198,16 @@ static void set_options(findFOPTS *fo, const char *opts) } 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 */ @@ -1156,7 +1252,7 @@ static void set_options(findFOPTS *fo, const char *opts) } -/* +/** * Director is passing his Fileset */ static int fileset_cmd(JCR *jcr) @@ -1197,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) { @@ -1244,7 +1342,7 @@ static int bootstrap_cmd(JCR *jcr) } -/* +/** * Get backup level from Director * */ @@ -1286,7 +1384,7 @@ 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->get_JobLevel() == L_NONE) { + 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", @@ -1349,7 +1447,7 @@ static int level_cmd(JCR *jcr) if (buf) { free_memory(buf); } - generate_plugin_event(jcr, bEventLevel, (void *)jcr->get_JobLevel()); + generate_plugin_event(jcr, bEventLevel, (void *)jcr->getJobLevel()); return dir->fsend(OKlevel); bail_out: @@ -1362,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) { @@ -1389,7 +1488,8 @@ static void set_storage_auth_key(JCR *jcr, char *key) return; } - /* We can be contacting multiple storage daemons. + /** + * We can be contacting multiple storage daemons. * So, make sure that any old jcr->store_bsock is cleaned up. */ if (jcr->store_bsock) { @@ -1397,11 +1497,13 @@ static void set_storage_auth_key(JCR *jcr, char *key) jcr->store_bsock = NULL; } - /* We can be contacting multiple storage daemons. + /** + * 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 + /* + * If we already have a Authorization key, director can do multi * storage restore */ Dmsg0(5, "set multi_restore=true\n"); @@ -1410,9 +1512,10 @@ static void set_storage_auth_key(JCR *jcr, char *key) } jcr->sd_auth_key = bstrdup(key); + Dmsg0(5, "set sd auth key\n"); } -/* +/** * Get address of storage daemon from Director * */ @@ -1428,11 +1531,9 @@ static int storage_cmd(JCR *jcr) Dmsg1(100, "StorageCmd: %s", dir->msg); 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) - { + &enable_ssl, sd_auth_key.c_str()) != 4) { if (sscanf(dir->msg, storaddr_v1, &jcr->stored_addr, - &stored_port, &enable_ssl) != 3) - { + &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; @@ -1481,7 +1582,7 @@ bail_out: } -/* +/** * Do a backup. */ static int backup_cmd(JCR *jcr) @@ -1502,7 +1603,7 @@ static int backup_cmd(JCR *jcr) } #endif - /* + /** * Validate some options given to the backup make sense for the compiled in * options of this filed. */ @@ -1528,12 +1629,12 @@ static int backup_cmd(JCR *jcr) dir->fsend(OKbackup); 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) { @@ -1548,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); @@ -1568,7 +1669,8 @@ static int backup_cmd(JCR *jcr) #if defined(WIN32_VSS) /* 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)) { @@ -1603,14 +1705,13 @@ static int backup_cmd(JCR *jcr) } #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); @@ -1619,7 +1720,7 @@ static int backup_cmd(JCR *jcr) 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")) { @@ -1627,7 +1728,7 @@ static int backup_cmd(JCR *jcr) goto cleanup; } - /* + /** * Send Append End Data to Storage daemon */ sd->fsend(append_end, jcr->Ticket); @@ -1637,7 +1738,7 @@ static int backup_cmd(JCR *jcr) goto cleanup; } - /* + /** * Send Append Close to Storage daemon */ sd->fsend(append_close, jcr->Ticket); @@ -1659,20 +1760,7 @@ static int backup_cmd(JCR *jcr) cleanup: #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->JobErrors++; - } - Jmsg(jcr, msg_type, 0, _("VSS Writer (BackupComplete): %s\n"), g_pVSSClient->GetWriterInfo(i)); - } - } Win32ConvCleanupCache(); V(vss_mutex); } @@ -1682,7 +1770,7 @@ cleanup: return 0; /* return and stop command loop */ } -/* +/** * Do a Verify for Director * */ @@ -1716,12 +1804,12 @@ static int verify_cmd(JCR *jcr) dir->fsend(OKverify); generate_daemon_event(jcr, "JobStart"); - generate_plugin_event(jcr, bEventLevel, (void *)jcr->get_JobLevel()); + generate_plugin_event(jcr, bEventLevel, (void *)jcr->getJobLevel()); generate_plugin_event(jcr, bEventStartVerifyJob); Dmsg1(110, "filed>dird: %s", dir->msg); - switch (jcr->get_JobLevel()) { + switch (jcr->getJobLevel()) { case L_VERIFY_INIT: case L_VERIFY_CATALOG: do_verify(jcr); @@ -1759,7 +1847,24 @@ static int verify_cmd(JCR *jcr) 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 * */ @@ -1772,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; @@ -1828,12 +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); @@ -1842,17 +1988,41 @@ static int restore_cmd(JCR *jcr) bnet_suppress_error_messages(sd, 1); } - /* + /** * Send Close session command to Storage daemon */ sd->fsend(read_close, jcr->Ticket); - Dmsg1(130, "filed>stored: %s", sd->msg); + Dmsg1(100, "filed>stored: %s", sd->msg); bget_msg(sd); /* get OK */ /* Inform Storage daemon that we are done */ 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); @@ -1860,10 +2030,11 @@ bail_out: 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 { @@ -1934,7 +2105,7 @@ static int open_sd_read_session(JCR *jcr) return 1; } -/* +/** * Destroy the Job Control Record and associated * resources (sockets). */ @@ -1956,7 +2127,7 @@ static void filed_free_jcr(JCR *jcr) return; } -/* +/** * Get response from Storage daemon to a command we * sent. Check that the response is OK. *