BSOCK *fd;
JOB_DBR rjr; /* restore job record */
+ free_wstorage(jcr); /* we don't write */
+
memset(&rjr, 0, sizeof(rjr));
jcr->jr.JobLevel = L_FULL; /* Full restore */
if (!db_update_job_start_record(jcr, jcr->db, &jcr->jr)) {
/*
* Now start a job with the Storage daemon
*/
- if (!start_storage_daemon_job(jcr, jcr->storage, NULL)) {
+ if (!start_storage_daemon_job(jcr, jcr->rstorage, NULL)) {
restore_cleanup(jcr, JS_ErrorTerminated);
return false;
}
+ if (!bnet_fsend(jcr->store_bsock, "run")) {
+ return false;
+ }
/*
* Now start a Storage daemon message thread
*/
}
Dmsg0(50, "Storage daemon connection OK\n");
- if (!bnet_fsend(jcr->store_bsock, "run")) {
- return false;
- }
/*
* Start conversation with File daemon
* then wait for File daemon to make connection
* with Storage daemon.
*/
- if (jcr->store->SDDport == 0) {
- jcr->store->SDDport = jcr->store->SDport;
+ if (jcr->rstore->SDDport == 0) {
+ jcr->rstore->SDDport = jcr->rstore->SDport;
}
- bnet_fsend(fd, storaddr, jcr->store->address, jcr->store->SDDport);
+ bnet_fsend(fd, storaddr, jcr->rstore->address, jcr->rstore->SDDport);
Dmsg1(6, "dird>filed: %s\n", fd->msg);
if (!response(jcr, fd, OKstore, "Storage", DISPLAY_ERROR)) {
restore_cleanup(jcr, JS_ErrorTerminated);
}
- if (!send_run_before_and_after_commands(jcr)) {
+ if (!send_runscripts_commands(jcr)) {
restore_cleanup(jcr, JS_ErrorTerminated);
return false;
}
bool do_restore_init(JCR *jcr)
{
+ free_wstorage(jcr);
return true;
}