#include "stored.h"
/* Imported variables */
+extern STORES *me;
/* Static variables */
static char ferrmsg[] = "3900 Invalid command\n";
static int read_open_session(JCR *jcr);
static int read_data_cmd(JCR *jcr);
static int read_close_session(JCR *jcr);
+static int bootstrap_cmd(JCR *jcr);
struct s_cmds {
char *cmd;
{"read open", read_open_session},
{"read data", read_data_cmd},
{"read close", read_close_session},
+ {"bootstrap", bootstrap_cmd},
{NULL, NULL} /* list terminator */
};
/* Commands from the File daemon that require additional scanning */
-/* static char append_open[] = "append open session\n"; */
-static char read_open[] = "read open session = %s %ld %ld %ld %ld %ld %ld\n";
+static char read_open[] = "read open session = %s %ld %ld %ld %ld %ld %ld\n";
/* Responses sent to the File daemon */
-static char NO_open[] = "3901 Error session already open\n";
-static char NOT_opened[] = "3902 Error session not opened\n";
-static char OK_end[] = "3000 OK end\n";
-static char OK_close[] = "3000 OK close Volumes = %d\n";
-static char OK_open[] = "3000 OK open ticket = %d\n";
-static char OK_append[] = "3000 OK append data\n";
-static char ERROR_append[] = "3903 Error append data\n";
+static char NO_open[] = "3901 Error session already open\n";
+static char NOT_opened[] = "3902 Error session not opened\n";
+static char OK_end[] = "3000 OK end\n";
+static char OK_close[] = "3000 OK close Status = %d\n";
+static char OK_open[] = "3000 OK open ticket = %d\n";
+static char OK_append[] = "3000 OK append data\n";
+static char ERROR_append[] = "3903 Error append data\n";
+static char OK_bootstrap[] = "3000 OK bootstrap\n";
+static char ERROR_bootstrap[] = "3904 Error bootstrap\n";
/* Information sent to the Director */
static char Job_start[] = "3010 Job %s start\n";
static char Job_end[] =
- "3099 Job %s end JobStatus=%d JobFiles=%d JobBytes=%" lld "\n";
+ "3099 Job %s end JobStatus=%d JobFiles=%d JobBytes=%s\n";
/*
* Run a File daemon Job -- File daemon already authorized
int i, found, quit;
BSOCK *fd = jcr->file_bsock;
BSOCK *dir = jcr->dir_bsock;
+ char ec1[30];
- Dmsg1(20, "Start run Job=%s\n", jcr->Job);
+ fd->jcr = (void *)jcr;
+ dir->jcr = (void *)jcr;
+ Dmsg1(120, "Start run Job=%s\n", jcr->Job);
bnet_fsend(dir, Job_start, jcr->Job);
- time(&jcr->start_time);
+ jcr->start_time = time(NULL);
jcr->run_time = jcr->start_time;
jcr->JobStatus = JS_Running;
dir_send_job_status(jcr); /* update director */
for (quit=0; !quit;) {
+ int stat;
/* Read command coming from the File daemon */
- if (bnet_recv(fd) <= 0) {
+ stat = bnet_recv(fd);
+ if (is_bnet_stop(fd)) { /* hardeof or error */
break; /* connection terminated */
}
- Dmsg1(10, "<filed: %s", fd->msg);
+ if (stat <= 0) {
+ continue; /* ignore signals and zero length msgs */
+ }
+ Dmsg1(110, "<filed: %s", fd->msg);
found = 0;
for (i=0; fd_cmds[i].cmd; i++) {
if (strncmp(fd_cmds[i].cmd, fd->msg, strlen(fd_cmds[i].cmd)) == 0) {
}
}
if (!found) { /* command not found */
- Dmsg1(10, "<filed: Command not found: %s\n", fd->msg);
+ Dmsg1(110, "<filed: Command not found: %s\n", fd->msg);
bnet_fsend(fd, ferrmsg);
break;
}
}
- time(&jcr->end_time);
+ bnet_sig(fd, BNET_TERMINATE); /* signal to FD job is done */
+ jcr->end_time = time(NULL);
if (!job_cancelled(jcr)) {
jcr->JobStatus = JS_Terminated;
}
bnet_fsend(dir, Job_end, jcr->Job, jcr->JobStatus, jcr->JobFiles,
- jcr->JobBytes);
+ edit_uint64(jcr->JobBytes, ec1));
- bnet_sig(dir, BNET_EOF); /* send EOF to Director daemon */
+ bnet_sig(dir, BNET_EOD); /* send EOD to Director daemon */
return;
}
{
BSOCK *fd = jcr->file_bsock;
- Dmsg1(20, "Append data: %s", fd->msg);
+ Dmsg1(120, "Append data: %s", fd->msg);
if (jcr->session_opened) {
- Dmsg1(10, "<bfiled: %s", fd->msg);
+ Dmsg1(110, "<bfiled: %s", fd->msg);
if (do_append_data(jcr)) {
bnet_fsend(fd, OK_append);
jcr->JobType = JT_BACKUP;
{
BSOCK *fd = jcr->file_bsock;
- Dmsg1(20, "store<file: %s", fd->msg);
+ Dmsg1(120, "store<file: %s", fd->msg);
if (!jcr->session_opened) {
bnet_fsend(fd, NOT_opened);
return 0;
{
BSOCK *fd = jcr->file_bsock;
- Dmsg1(20, "Append open session: %s", fd->msg);
+ Dmsg1(120, "Append open session: %s", fd->msg);
if (jcr->session_opened) {
bnet_fsend(fd, NO_open);
return 0;
}
- Dmsg1(10, "Append open session: %s\n", dev_name(jcr->device->dev));
+ Dmsg1(110, "Append open session: %s\n", dev_name(jcr->device->dev));
jcr->session_opened = TRUE;
/* Send "Ticket" to File Daemon */
bnet_fsend(fd, OK_open, jcr->VolSessionId);
- Dmsg1(10, ">filed: %s", fd->msg);
+ Dmsg1(110, ">filed: %s", fd->msg);
return 1;
}
{
BSOCK *fd = jcr->file_bsock;
- Dmsg1(20, "<filed: %s\n", fd->msg);
+ Dmsg1(120, "<filed: %s\n", fd->msg);
if (!jcr->session_opened) {
bnet_fsend(fd, NOT_opened);
return 0;
}
+ if (jcr->JobStatus != JS_ErrorTerminated) {
+ jcr->JobStatus = JS_Terminated;
+ }
/* Send final statistics to File daemon */
- bnet_fsend(fd, OK_close, jcr->NumVolumes);
- Dmsg1(60, ">filed: %s\n", fd->msg);
+ bnet_fsend(fd, OK_close, jcr->JobStatus);
+ Dmsg1(160, ">filed: %s\n", fd->msg);
- bnet_sig(fd, BNET_EOF); /* send EOF to File daemon */
+ bnet_sig(fd, BNET_EOD); /* send EOD to File daemon */
- Dmsg1(10, "Append close session: %s\n", dev_name(jcr->device->dev));
+ Dmsg1(110, "Append close session: %s\n", dev_name(jcr->device->dev));
- if (jcr->JobStatus != JS_ErrorTerminated) {
- jcr->JobStatus = JS_Terminated;
- }
jcr->session_opened = FALSE;
return 1;
}
{
BSOCK *fd = jcr->file_bsock;
- Dmsg1(20, "Read data: %s\n", fd->msg);
+ Dmsg1(120, "Read data: %s\n", fd->msg);
if (jcr->session_opened) {
- Dmsg1(20, "<bfiled: %s", fd->msg);
+ Dmsg1(120, "<bfiled: %s", fd->msg);
return do_read_data(jcr);
} else {
bnet_fsend(fd, NOT_opened);
{
BSOCK *fd = jcr->file_bsock;
- Dmsg1(20, "%s\n", fd->msg);
+ Dmsg1(120, "%s\n", fd->msg);
if (jcr->session_opened) {
bnet_fsend(fd, NO_open);
return 0;
jcr->read_EndBlock);
}
- Dmsg1(10, "Read open session: %s\n", dev_name(jcr->device->dev));
+ Dmsg1(110, "Read open session: %s\n", dev_name(jcr->device->dev));
jcr->session_opened = TRUE;
jcr->JobType = JT_RESTORE;
/* Send "Ticket" to File Daemon */
bnet_fsend(fd, OK_open, jcr->VolSessionId);
- Dmsg1(10, ">filed: %s", fd->msg);
+ Dmsg1(110, ">filed: %s", fd->msg);
return 1;
}
+static int bootstrap_cmd(JCR *jcr)
+{
+ BSOCK *fd = jcr->file_bsock;
+ POOLMEM *fname = get_pool_memory(PM_FNAME);
+ FILE *bs;
+
+ if (jcr->RestoreBootstrap) {
+ unlink(jcr->RestoreBootstrap);
+ free_pool_memory(jcr->RestoreBootstrap);
+ }
+ Mmsg(&fname, "%s/%s.%s.bootstrap", me->working_directory, me->hdr.name,
+ jcr->Job);
+ Dmsg1(400, "bootstrap=%s\n", fname);
+ jcr->RestoreBootstrap = fname;
+ bs = fopen(fname, "a+"); /* create file */
+ if (!bs) {
+ Jmsg(jcr, M_FATAL, 0, _("Could not create bootstrap file %s: ERR=%s\n"),
+ jcr->RestoreBootstrap, strerror(errno));
+ goto bail_out;
+ }
+ while (bnet_recv(fd) >= 0) {
+ Dmsg1(400, "stored<filed: bootstrap file %s\n", fd->msg);
+ fputs(fd->msg, bs);
+ }
+ fclose(bs);
+ jcr->bsr = parse_bsr(jcr, jcr->RestoreBootstrap);
+ if (!jcr->bsr) {
+ Jmsg(jcr, M_FATAL, 0, _("Error parsing bootstrap file.\n"));
+ goto bail_out;
+ }
+ if (debug_level > 20) {
+ dump_bsr(jcr->bsr);
+ }
+ return bnet_fsend(fd, OK_bootstrap);
+
+bail_out:
+ unlink(jcr->RestoreBootstrap);
+ free_pool_memory(jcr->RestoreBootstrap);
+ jcr->RestoreBootstrap = NULL;
+ bnet_fsend(fd, ERROR_bootstrap);
+ return 0;
+
+}
+
+
/*
* Read Close session command
* Close the read session
{
BSOCK *fd = jcr->file_bsock;
- Dmsg1(20, "Read close session: %s\n", fd->msg);
+ Dmsg1(120, "Read close session: %s\n", fd->msg);
if (!jcr->session_opened) {
bnet_fsend(fd, NOT_opened);
return 0;
}
/* Send final statistics to File daemon */
bnet_fsend(fd, OK_close);
- Dmsg1(60, ">filed: %s\n", fd->msg);
+ Dmsg1(160, ">filed: %s\n", fd->msg);
- bnet_sig(fd, BNET_EOF); /* send EOF to File daemon */
+ bnet_sig(fd, BNET_EOD); /* send EOD to File daemon */
jcr->session_opened = FALSE;
return 1;