/* Commands sent to File daemon */
static char backupcmd[] = "backup\n";
static char storaddr[] = "storage address=%s port=%d ssl=%d\n";
-static char levelcmd[] = "level = %s%s\n";
+static char levelcmd[] = "level = %s%s mtime_only=%d\n";
/* Responses received from File daemon */
static char OKbackup[] = "2000 OK backup\n";
jcr->jr.JobId = 0;
if (!db_find_job_start_time(jcr, jcr->db, &jcr->jr, &jcr->stime)) {
Jmsg(jcr, M_INFO, 0, "%s", db_strerror(jcr->db));
- Jmsg(jcr, M_INFO, 0, _("No prior or suitable FULL backup found. Doing FULL backup.\n"));
+ Jmsg(jcr, M_INFO, 0, _("No prior or suitable Full backup found. Doing FULL backup.\n"));
bsnprintf(since, sizeof(since), " (upgraded from %s)",
level_to_str(jcr->jr.Level));
jcr->JobLevel = jcr->jr.Level = L_FULL;
*/
switch (jcr->JobLevel) {
case L_BASE:
- bnet_fsend(fd, levelcmd, "base", " ");
+ bnet_fsend(fd, levelcmd, "base", " ", 0);
break;
case L_FULL:
- bnet_fsend(fd, levelcmd, "full", " ");
+ bnet_fsend(fd, levelcmd, "full", " ", 0);
break;
case L_DIFFERENTIAL:
case L_INCREMENTAL:
- bnet_fsend(fd, levelcmd, "since ", jcr->stime);
- free_pool_memory(jcr->stime);
- jcr->stime = NULL;
+ bnet_fsend(fd, levelcmd, "since ", jcr->stime, 0);
break;
case L_SINCE:
default:
return 1;
bail_out:
- if (jcr->stime) {
- free_pool_memory(jcr->stime);
- jcr->stime = NULL;
- }
backup_cleanup(jcr, JS_ErrorTerminated, since, &fsr);
return 0;
-
}
/*
/* Note, the SD stores in jcr->JobFiles/ReadBytes/JobBytes/Errors */
wait_for_storage_daemon_termination(jcr);
- /* Return the first error status we find FD or SD */
- if (fd_ok && jcr->JobStatus != JS_Terminated) {
- return jcr->JobStatus;
+ /* Return values from FD */
+ if (fd_ok) {
+ jcr->JobFiles = JobFiles;
+ jcr->Errors = Errors;
+ jcr->ReadBytes = ReadBytes;
+ jcr->JobBytes = JobBytes;
}
+
+// Dmsg4(000, "fd_ok=%d FDJS=%d JS=%d SDJS=%d\n", fd_ok, jcr->FDJobStatus,
+// jcr->JobStatus, jcr->SDJobStatus);
+
+ /* Return the first error status we find Dir, FD, or SD */
if (!fd_ok || is_bnet_error(fd)) {
- return JS_ErrorTerminated;
+ jcr->FDJobStatus = JS_ErrorTerminated;
+ }
+ if (jcr->JobStatus != JS_Terminated) {
+ return jcr->JobStatus;
+ }
+ if (jcr->FDJobStatus != JS_Terminated) {
+ return jcr->FDJobStatus;
}
- /* Return values from FD */
- jcr->JobFiles = JobFiles;
- jcr->Errors = Errors;
- jcr->ReadBytes = ReadBytes;
- jcr->JobBytes = JobBytes;
return jcr->SDJobStatus;
}
Bytes Written: %s\n\
Rate: %.1f KB/s\n\
Software Compression: %s\n\
-Volume names(s): %s\n\
+Volume name(s): %s\n\
Volume Session Id: %d\n\
Volume Session Time: %d\n\
Last Volume Bytes: %s\n\