X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fdird%2Fbackup.c;h=d570e274eedfebdc39fb090ee4a5066efc514dba;hb=b9ac1b6c82fd69ecf139edce98585a889906db8b;hp=e9151ec85bdbd6e80728a5ec4245b66308981454;hpb=3c4aa7c0dd0b6831656bdcc7703849f62471b689;p=bacula%2Fbacula diff --git a/bacula/src/dird/backup.c b/bacula/src/dird/backup.c index e9151ec85b..d570e274ee 100644 --- a/bacula/src/dird/backup.c +++ b/bacula/src/dird/backup.c @@ -41,12 +41,10 @@ /* 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 mtime_only=%d\n"; /* Responses received from File daemon */ static char OKbackup[] = "2000 OK backup\n"; static char OKstore[] = "2000 OK storage\n"; -static char OKlevel[] = "2000 OK level\n"; static char EndJob[] = "2800 End Job TermCode=%d JobFiles=%u " "ReadBytes=%" lld " JobBytes=%" lld " Errors=%u\n"; @@ -106,31 +104,7 @@ int do_backup(JCR *jcr) Dmsg2(119, "Created FileSet %s record %u\n", jcr->fileset->hdr.name, jcr->jr.FileSetId); - /* Look up the last - * FULL backup job to get the time/date for a - * differential or incremental save. - */ - jcr->stime = get_pool_memory(PM_MESSAGE); - jcr->stime[0] = 0; - since[0] = 0; - switch (jcr->JobLevel) { - case L_DIFFERENTIAL: - case L_INCREMENTAL: - /* Look up start time of last job */ - 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")); - bsnprintf(since, sizeof(since), " (upgraded from %s)", - level_to_str(jcr->jr.Level)); - jcr->JobLevel = jcr->jr.Level = L_FULL; - } else { - bstrncpy(since, ", since=", sizeof(since)); - bstrncat(since, jcr->stime, sizeof(since)); - } - Dmsg1(115, "Last start time = %s\n", jcr->stime); - break; - } + get_level_since_time(jcr, since, sizeof(since)); jcr->jr.JobId = jcr->JobId; jcr->jr.StartTime = jcr->start_time; @@ -146,10 +120,28 @@ int do_backup(JCR *jcr) jcr->JobId, jcr->Job); /* - * Get the Pool record + * Get the Pool record -- first apply any level defined pools */ + switch (jcr->JobLevel) { + case L_FULL: + if (jcr->full_pool) { + jcr->pool = jcr->full_pool; + } + break; + case L_INCREMENTAL: + if (jcr->inc_pool) { + jcr->pool = jcr->inc_pool; + } + break; + case L_DIFFERENTIAL: + if (jcr->dif_pool) { + jcr->pool = jcr->dif_pool; + } + break; + } memset(&pr, 0, sizeof(pr)); bstrncpy(pr.Name, jcr->pool->hdr.name, sizeof(pr.Name)); + while (!db_get_pool_record(jcr, jcr->db, &pr)) { /* get by Name */ /* Try to create the pool */ if (create_pool(jcr, jcr->db, jcr->pool, POOL_OP_CREATE) < 0) { @@ -219,30 +211,12 @@ int do_backup(JCR *jcr) goto bail_out; } - /* - * Send Level command to File daemon - */ - switch (jcr->JobLevel) { - case L_BASE: - bnet_fsend(fd, levelcmd, "base", " ", 0); - break; - case L_FULL: - bnet_fsend(fd, levelcmd, "full", " ", 0); - break; - case L_DIFFERENTIAL: - case L_INCREMENTAL: - bnet_fsend(fd, levelcmd, "since ", jcr->stime, 0); - free_pool_memory(jcr->stime); - jcr->stime = NULL; - break; - case L_SINCE: - default: - Jmsg2(jcr, M_FATAL, 0, _("Unimplemented backup level %d %c\n"), - jcr->JobLevel, jcr->JobLevel); - goto bail_out; + + if (!send_level_command(jcr)) { + goto bail_out; } - Dmsg1(120, ">filed: %s", fd->msg); - if (!response(jcr, fd, OKlevel, "Level", DISPLAY_ERROR)) { + + if (!send_run_before_and_after_commands(jcr)) { goto bail_out; } @@ -258,13 +232,8 @@ int do_backup(JCR *jcr) return 1; bail_out: - if (jcr->stime) { - free_pool_memory(jcr->stime); - jcr->stime = NULL; - } backup_cleanup(jcr, JS_ErrorTerminated, since, &fsr); return 0; - } /* @@ -277,7 +246,7 @@ int wait_for_job_termination(JCR *jcr) { int32_t n = 0; BSOCK *fd = jcr->file_bsock; - int fd_ok = FALSE; + bool fd_ok = false; uint32_t JobFiles, Errors; uint64_t ReadBytes, JobBytes; @@ -286,7 +255,7 @@ int wait_for_job_termination(JCR *jcr) while ((n = bget_dirmsg(fd)) >= 0) { if (!fd_ok && sscanf(fd->msg, EndJob, &jcr->FDJobStatus, &JobFiles, &ReadBytes, &JobBytes, &Errors) == 5) { - fd_ok = TRUE; + fd_ok = true; set_jcr_job_status(jcr, jcr->FDJobStatus); Dmsg1(100, "FDStatus=%c\n", (char)jcr->JobStatus); } else { @@ -306,15 +275,18 @@ int wait_for_job_termination(JCR *jcr) /* Note, the SD stores in jcr->JobFiles/ReadBytes/JobBytes/Errors */ wait_for_storage_daemon_termination(jcr); + /* Return values from FD */ if (fd_ok) { jcr->JobFiles = JobFiles; jcr->Errors = Errors; jcr->ReadBytes = ReadBytes; jcr->JobBytes = JobBytes; + } else { + Jmsg(jcr, M_FATAL, 0, _("No Job status returned from FD.\n")); } -// Dmsg4(000, "fd_ok=%d FDJS=%d JS=%d SDJS=%d\n", fd_ok, jcr->FDJobStatus, +// Dmsg4(100, "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 */ @@ -336,7 +308,7 @@ int wait_for_job_termination(JCR *jcr) static void backup_cleanup(JCR *jcr, int TermCode, char *since, FILESET_DBR *fsr) { char sdt[50], edt[50]; - char ec1[30], ec2[30], ec3[30], compress[50]; + char ec1[30], ec2[30], ec3[30], ec4[30], ec5[30], compress[50]; char term_code[100], fd_term_msg[100], sd_term_msg[100]; char *term_msg; int msg_type; @@ -344,7 +316,7 @@ static void backup_cleanup(JCR *jcr, int TermCode, char *since, FILESET_DBR *fsr double kbps, compression; utime_t RunTime; - Dmsg0(100, "Enter backup_cleanup()\n"); + Dmsg2(100, "Enter backup_cleanup %d %c\n", TermCode, TermCode); memset(&mr, 0, sizeof(mr)); set_jcr_job_status(jcr, TermCode); @@ -386,8 +358,12 @@ static void backup_cleanup(JCR *jcr, int TermCode, char *since, FILESET_DBR *fsr VolCount = db_get_job_volume_parameters(jcr, jcr->db, jcr->JobId, &VolParams); if (VolCount == 0) { - Jmsg(jcr, M_ERROR, 0, _("Could not get Job Volume Parameters. ERR=%s\n"), - db_strerror(jcr->db)); + Jmsg(jcr, M_ERROR, 0, _("Could not get Job Volume Parameters to " + "update Bootstrap file. ERR=%s\n"), db_strerror(jcr->db)); + if (jcr->SDJobFiles != 0) { + set_jcr_job_status(jcr, JS_ErrorTerminated); + } + } for (int i=0; i < VolCount; i++) { /* Write the record */ @@ -427,14 +403,18 @@ static void backup_cleanup(JCR *jcr, int TermCode, char *since, FILESET_DBR *fsr msg_type = M_ERROR; /* Generate error message */ if (jcr->store_bsock) { bnet_sig(jcr->store_bsock, BNET_TERMINATE); - pthread_cancel(jcr->SD_msg_chan); + if (jcr->SD_msg_chan) { + pthread_cancel(jcr->SD_msg_chan); + } } break; case JS_Canceled: term_msg = _("Backup Canceled"); if (jcr->store_bsock) { bnet_sig(jcr->store_bsock, BNET_TERMINATE); - pthread_cancel(jcr->SD_msg_chan); + if (jcr->SD_msg_chan) { + pthread_cancel(jcr->SD_msg_chan); + } } break; default: @@ -484,8 +464,10 @@ Client: %s\n\ FileSet: \"%s\" %s\n\ Start time: %s\n\ End time: %s\n\ -Files Written: %s\n\ -Bytes Written: %s\n\ +FD Files Written: %s\n\ +SD Files Written: %s\n\ +FD Bytes Written: %s\n\ +SD Bytes Written: %s\n\ Rate: %.1f KB/s\n\ Software Compression: %s\n\ Volume name(s): %s\n\ @@ -493,6 +475,7 @@ Volume Session Id: %d\n\ Volume Session Time: %d\n\ Last Volume Bytes: %s\n\ Non-fatal FD errors: %d\n\ +SD Errors: %d\n\ FD termination status: %s\n\ SD termination status: %s\n\ Termination: %s\n\n"), @@ -505,7 +488,9 @@ Termination: %s\n\n"), sdt, edt, edit_uint64_with_commas(jcr->jr.JobFiles, ec1), + edit_uint64_with_commas(jcr->SDJobFiles, ec4), edit_uint64_with_commas(jcr->jr.JobBytes, ec2), + edit_uint64_with_commas(jcr->SDJobBytes, ec5), (float)kbps, compress, jcr->VolumeName, @@ -513,6 +498,7 @@ Termination: %s\n\n"), jcr->VolSessionTime, edit_uint64_with_commas(mr.VolBytes, ec3), jcr->Errors, + jcr->SDErrors, fd_term_msg, sd_term_msg, term_msg);