X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Ffiled%2Fjob.c;h=4a224cd68f9591969de13dece0780ee4c9943ff8;hb=cbfe8e1c9fd311e7ed6d102b35996a31a6e95497;hp=bcdc459a36e342b6c47bbb184e0b02969aed0144;hpb=1ae317bf276a75a62dc90f03d30ea3165702473e;p=bacula%2Fbacula diff --git a/bacula/src/filed/job.c b/bacula/src/filed/job.c index bcdc459a36..4a224cd68f 100644 --- a/bacula/src/filed/job.c +++ b/bacula/src/filed/job.c @@ -88,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); @@ -111,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}, @@ -124,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 */ }; @@ -135,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"; @@ -165,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 */ @@ -615,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; @@ -1418,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) { @@ -1431,7 +1502,8 @@ static void set_storage_auth_key(JCR *jcr, char *key) * 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"); @@ -1440,6 +1512,7 @@ static void set_storage_auth_key(JCR *jcr, char *key) } jcr->sd_auth_key = bstrdup(key); + Dmsg0(5, "set sd auth key\n"); } /** @@ -1597,7 +1670,7 @@ static int backup_cmd(JCR *jcr) /* START VSS ON WIN32 */ if (jcr->VSS) { if (g_pVSSClient->InitializeForBackup(jcr)) { - generate_plugin_event(jcr, bEventInitializeVSS); + generate_plugin_event(jcr, bEventVssBackupAddComponents); /* tell vss which drives to snapshot */ char szWinDriveLetters[27]; if (get_win32_driveletters(jcr->ff, szWinDriveLetters)) { @@ -1639,7 +1712,6 @@ static int backup_cmd(JCR *jcr) if (!blast_data_to_storage_daemon(jcr, NULL)) { set_jcr_job_status(jcr, JS_ErrorTerminated); bnet_suppress_error_messages(sd, 1); - bget_msg(sd); /* Read final response from append_data */ Dmsg0(110, "Error in blast_data.\n"); } else { set_jcr_job_status(jcr, JS_Terminated); @@ -1688,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); } @@ -1788,6 +1847,23 @@ 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 * @@ -1804,7 +1880,22 @@ static int restore_cmd(JCR *jcr) /** * 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; @@ -1863,6 +1954,32 @@ static int restore_cmd(JCR *jcr) 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); @@ -1875,13 +1992,37 @@ static int restore_cmd(JCR *jcr) * 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); @@ -1889,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 {