*
*/
/*
- Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker
+ Copyright (C) 2000-2003 Kern Sibbald and John Walker
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
};
/* Commands from the File daemon that require additional scanning */
-static char read_open[] = "read open session = %s %ld %ld %ld %ld %ld %ld\n";
+static char read_open[] = "read open session = %127s %ld %ld %ld %ld %ld %ld\n";
/* Responses sent to the File daemon */
static char NO_open[] = "3901 Error session already open\n";
char ec1[30];
- fd->jcr = (void *)jcr;
- dir->jcr = (void *)jcr;
+ fd->jcr = jcr;
+ dir->jcr = jcr;
Dmsg1(120, "Start run Job=%s\n", jcr->Job);
bnet_fsend(dir, Job_start, jcr->Job);
jcr->start_time = time(NULL);
jcr->run_time = jcr->start_time;
- jcr->JobStatus = JS_Running;
+ set_jcr_job_status(jcr, JS_Running);
dir_send_job_status(jcr); /* update director */
for (quit=0; !quit;) {
int stat;
if (strncmp(fd_cmds[i].cmd, fd->msg, strlen(fd_cmds[i].cmd)) == 0) {
found = 1; /* indicate command found */
if (!fd_cmds[i].func(jcr)) { /* do command */
- jcr->JobStatus = JS_ErrorTerminated;
+ set_jcr_job_status(jcr, JS_ErrorTerminated);
quit = 1;
}
break;
}
bnet_sig(fd, BNET_TERMINATE); /* signal to FD job is done */
jcr->end_time = time(NULL);
- if (!job_cancelled(jcr)) {
- jcr->JobStatus = JS_Terminated;
- }
+ set_jcr_job_status(jcr, JS_Terminated);
bnet_fsend(dir, Job_end, jcr->Job, jcr->JobStatus, jcr->JobFiles,
edit_uint64(jcr->JobBytes, ec1));
-
bnet_sig(dir, BNET_EOD); /* send EOD to Director daemon */
return;
}
Dmsg1(120, "Append data: %s", fd->msg);
if (jcr->session_opened) {
Dmsg1(110, "<bfiled: %s", fd->msg);
+ jcr->JobType = JT_BACKUP;
if (do_append_data(jcr)) {
bnet_fsend(fd, OK_append);
- jcr->JobType = JT_BACKUP;
return 1;
} else {
+ bnet_suppress_error_messages(fd, 1); /* ignore errors at this point */
bnet_fsend(fd, ERROR_append);
return 0;
}
bnet_fsend(fd, NOT_opened);
return 0;
}
+ set_jcr_job_status(jcr, JS_Terminated);
return bnet_fsend(fd, OK_end);
}
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->JobStatus);
- Dmsg1(160, ">filed: %s\n", fd->msg);
+ Dmsg1(120, ">filed: %s\n", fd->msg);
bnet_sig(fd, BNET_EOD); /* send EOD to File daemon */
BSOCK *fd = jcr->file_bsock;
POOLMEM *fname = get_pool_memory(PM_FNAME);
FILE *bs;
+ int stat = 0;
if (jcr->RestoreBootstrap) {
unlink(jcr->RestoreBootstrap);
goto bail_out;
}
if (debug_level > 20) {
- dump_bsr(jcr->bsr);
+ dump_bsr(jcr->bsr, true);
}
- return bnet_fsend(fd, OK_bootstrap);
+ stat = 1;
bail_out:
unlink(jcr->RestoreBootstrap);
free_pool_memory(jcr->RestoreBootstrap);
jcr->RestoreBootstrap = NULL;
- bnet_fsend(fd, ERROR_bootstrap);
- return 0;
-
+ if (stat) {
+ return bnet_fsend(fd, OK_bootstrap);
+ } else {
+ bnet_fsend(fd, ERROR_bootstrap);
+ return 0;
+ }
}