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);
{"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},
{"RunAfterJob", runafter_cmd, 0},
{"Run", runscript_cmd, 0},
{"accurate", accurate_cmd, 0},
+ {"restoreobject", restore_object_cmd, 0},
{NULL, NULL} /* list terminator */
};
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";
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 */
}
+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;
* 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;
}
}
+/**
+ * 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)
{
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;
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) {
* 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");
}
jcr->sd_auth_key = bstrdup(key);
+ Dmsg0(5, "set sd auth key\n");
}
/**
#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)) {
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);
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);
}
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
*
/**
* 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;
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);
* 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);
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 {
projects / bacula / bacula / blobdiff