X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fdird%2Fbackup.c;h=f4eba70dd5948242e428a7d90f7d6dc11f99992c;hb=f183afa93772e5f5b3951407bce839b951dede96;hp=92c1f6e200e415b48acb7429a83b06ae539cb045;hpb=288ea8ab889d58c06cc1b95aeca0485082a63bb9;p=bacula%2Fbacula diff --git a/bacula/src/dird/backup.c b/bacula/src/dird/backup.c index 92c1f6e200..f4eba70dd5 100644 --- a/bacula/src/dird/backup.c +++ b/bacula/src/dird/backup.c @@ -4,35 +4,27 @@ * * Kern Sibbald, March MM * - * This routine is called as a thread. It may not yet be totally - * thread reentrant!!! - * * Basic tasks done here: * Open DB and create records for this job. * Open Message Channel with Storage daemon to tell him a job will be starting. * Open connection with File daemon and pass him commands - * to do the backup. + * to do the backup. * When the File daemon finishes the job, update the DB. * + * Version $Id$ */ - /* - Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker + Copyright (C) 2000-2005 Kern Sibbald This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License as - published by the Free Software Foundation; either version 2 of - the License, or (at your option) any later version. + modify it under the terms of the GNU General Public License + version 2 as ammended with additional clauses defined in the + file LICENSE in the main source directory. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + the file LICENSE for additional details. */ @@ -42,163 +34,120 @@ /* Commands sent to File daemon */ static char backupcmd[] = "backup\n"; -static char storaddr[] = "storage address=%s port=%d\n"; -static char levelcmd[] = "level = %s%s\n"; +static char storaddr[] = "storage address=%s port=%d ssl=%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"; - -/* Forward referenced functions */ -static void backup_cleanup(JCR *jcr, int TermCode, char *since); -static int wait_for_job_termination(JCR *jcr); - -/* External functions */ +static char OKbackup[] = "2000 OK backup\n"; +static char OKstore[] = "2000 OK storage\n"; +static char EndJob[] = "2800 End Job TermCode=%d JobFiles=%u " + "ReadBytes=%lld JobBytes=%lld Errors=%u\n"; /* - * Do a backup of the specified FileSet - * - * Returns: 0 on failure - * 1 on success + * Called here before the job is run to do the job + * specific setup. */ -int do_backup(JCR *jcr) +bool do_backup_init(JCR *jcr) { - char since[MAXSTRING]; - int stat; - BSOCK *fd; - POOL_DBR pr; -#ifdef needed - MEDIA_DBR mr; -#endif - CLIENT_DBR cr; FILESET_DBR fsr; - - since[0] = 0; - /* - * Get or Create client record - */ - memset(&cr, 0, sizeof(cr)); - strcpy(cr.Name, jcr->client->hdr.name); - cr.AutoPrune = jcr->client->AutoPrune; - cr.FileRetention = jcr->client->FileRetention; - cr.JobRetention = jcr->client->JobRetention; - if (jcr->client_name) { - free(jcr->client_name); - } - jcr->client_name = bstrdup(jcr->client->hdr.name); - if (!db_create_client_record(jcr->db, &cr)) { - Jmsg(jcr, M_ERROR, 0, _("Could not create Client record. %s"), - db_strerror(jcr->db)); - backup_cleanup(jcr, JS_ErrorTerminated, since); - return 0; - } - jcr->jr.ClientId = cr.ClientId; - Dmsg2(9, "Created Client %s record %d\n", jcr->client->hdr.name, - jcr->jr.ClientId); - + POOL_DBR pr; /* - * Get or Create FileSet record + * Get the Pool record -- first apply any level defined pools */ - memset(&fsr, 0, sizeof(fsr)); - strcpy(fsr.FileSet, jcr->fileset->hdr.name); - if (jcr->fileset->have_MD5) { - struct MD5Context md5c; - unsigned char signature[16]; - memcpy(&md5c, &jcr->fileset->md5c, sizeof(md5c)); - MD5Final(signature, &md5c); - bin_to_base64(fsr.MD5, (char *)signature, 16); /* encode 16 bytes */ - } else { - Jmsg(jcr, M_WARNING, 0, _("FileSet MD5 signature not found.\n")); - } - if (!db_create_fileset_record(jcr->db, &fsr)) { - Jmsg(jcr, M_ERROR, 0, _("Could not create FileSet record. %s"), - db_strerror(jcr->db)); - backup_cleanup(jcr, JS_ErrorTerminated, since); - return 0; - } - jcr->jr.FileSetId = fsr.FileSetId; - Dmsg2(9, "Created FileSet %s record %d\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 = (char *) get_pool_memory(PM_MESSAGE); - jcr->stime[0] = 0; - since[0] = 0; - switch (jcr->level) { - case L_DIFFERENTIAL: - case L_INCREMENTAL: - /* Look up start time of last job */ - jcr->jr.JobId = 0; - if (!db_find_job_start_time(jcr->db, &jcr->jr, jcr->stime)) { - Jmsg(jcr, M_INFO, 0, _("Last FULL backup time not found. Doing FULL backup.\n")); - jcr->level = L_FULL; - jcr->jr.Level = L_FULL; - } else { - strcpy(since, ", since="); - strcat(since, jcr->stime); - } - Dmsg1(15, "Last start time = %s\n", jcr->stime); - break; - } - - jcr->jr.JobId = jcr->JobId; - jcr->jr.StartTime = jcr->start_time; - if (!db_update_job_start_record(jcr->db, &jcr->jr)) { - Jmsg(jcr, M_ERROR, 0, "%s", db_strerror(jcr->db)); - backup_cleanup(jcr, JS_ErrorTerminated, since); - return 0; + 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; } - - jcr->fname = (char *) get_pool_memory(PM_FNAME); - - /* Print Job Start message */ - Jmsg(jcr, M_INFO, 0, _("Start Backup JobId %d, Job=%s\n"), - jcr->JobId, jcr->Job); - - /* - * Get the Pool record - */ memset(&pr, 0, sizeof(pr)); - strcpy(pr.Name, jcr->pool->hdr.name); - while (!db_get_pool_record(jcr->db, &pr)) { /* get by Name */ + bstrncpy(pr.Name, jcr->pool->hdr.name, sizeof(pr.Name)); + + if (!db_get_pool_record(jcr, jcr->db, &pr)) { /* get by Name */ /* Try to create the pool */ - if (create_pool(jcr->db, jcr->pool) < 0) { - Jmsg(jcr, M_FATAL, 0, _("Pool %s not in database. %s"), pr.Name, - db_strerror(jcr->db)); - backup_cleanup(jcr, JS_ErrorTerminated, since); - return 0; + if (create_pool(jcr, jcr->db, jcr->pool, POOL_OP_CREATE) < 0) { + Jmsg(jcr, M_FATAL, 0, _("Pool %s not in database. %s"), pr.Name, + db_strerror(jcr->db)); + return false; } else { Jmsg(jcr, M_INFO, 0, _("Pool %s created in database.\n"), pr.Name); + if (!db_get_pool_record(jcr, jcr->db, &pr)) { /* get by Name */ + Jmsg(jcr, M_FATAL, 0, _("Pool %s not in database. %s"), pr.Name, + db_strerror(jcr->db)); + return false; + } } } - jcr->PoolId = pr.PoolId; /****FIXME**** this can go away */ + jcr->PoolId = pr.PoolId; /****FIXME**** this can go away */ jcr->jr.PoolId = pr.PoolId; -#ifdef needed - /* NOTE, THIS IS NOW DONE BY THE STORAGE DAEMON - * - * Find at least one Volume associated with this Pool - * It must be marked Append, and be of the correct Media Type - * for the storage type. - */ - memset(&mr, 0, sizeof(mr)); - mr.PoolId = pr.PoolId; - strcpy(mr.VolStatus, "Append"); - strcpy(mr.MediaType, jcr->store->media_type); - if (!db_find_next_volume(jcr->db, 1, &mr)) { - if (!newVolume(jcr)) { - Jmsg(jcr, M_FATAL, 0, _("No writable %s media in Pool %s.\n\ - Please use the Console program to add available Volumes.\n"), mr.MediaType, pr.Name); - backup_cleanup(jcr, JS_ErrorTerminated, since); - return 0; + if (!get_or_create_fileset_record(jcr, &fsr)) { + return false; + } + bstrncpy(jcr->FSCreateTime, fsr.cCreateTime, sizeof(jcr->FSCreateTime)); + + get_level_since_time(jcr, jcr->since, sizeof(jcr->since)); + + Dmsg2(900, "cloned=%d run_cmds=%p\n", jcr->cloned, jcr->job->run_cmds); + if (!jcr->cloned && jcr->job->run_cmds) { + char *runcmd; + JOB *job = jcr->job; + POOLMEM *cmd = get_pool_memory(PM_FNAME); + UAContext *ua = new_ua_context(jcr); + ua->batch = true; + foreach_alist(runcmd, job->run_cmds) { + cmd = edit_job_codes(jcr, cmd, runcmd, ""); + Mmsg(ua->cmd, "run %s cloned=yes", cmd); + Dmsg1(900, "=============== Clone cmd=%s\n", ua->cmd); + parse_ua_args(ua); /* parse command */ + int stat = run_cmd(ua, ua->cmd); + if (stat == 0) { + Jmsg(jcr, M_ERROR, 0, _("Could not start clone job.\n")); + } else { + Jmsg(jcr, M_INFO, 0, _("Clone JobId %d started.\n"), stat); + } } + free_ua_context(ua); + free_pool_memory(cmd); + } + + return true; +} + +/* + * Do a backup of the specified FileSet + * + * Returns: false on failure + * true on success + */ +bool do_backup(JCR *jcr) +{ + int stat; + int tls_need = BNET_TLS_NONE; + BSOCK *fd; + STORE *store; + + + /* Print Job Start message */ + Jmsg(jcr, M_INFO, 0, _("Start Backup JobId %u, Job=%s\n"), + jcr->JobId, jcr->Job); + + set_jcr_job_status(jcr, JS_Running); + Dmsg2(100, "JobId=%d JobLevel=%c\n", jcr->jr.JobId, jcr->jr.JobLevel); + if (!db_update_job_start_record(jcr, jcr->db, &jcr->jr)) { + Jmsg(jcr, M_FATAL, 0, "%s", db_strerror(jcr->db)); + return false; } -#endif /* * Open a message channel connection with the Storage @@ -206,138 +155,157 @@ int do_backup(JCR *jcr) * will be contacting him for a backup session. * */ - Dmsg0(10, "Open connection with storage daemon\n"); - jcr->JobStatus = JS_Blocked; + Dmsg0(110, "Open connection with storage daemon\n"); + set_jcr_job_status(jcr, JS_WaitSD); /* - * Start conversation with Storage daemon + * Start conversation with Storage daemon */ if (!connect_to_storage_daemon(jcr, 10, SDConnectTimeout, 1)) { - backup_cleanup(jcr, JS_ErrorTerminated, since); - return 0; + return false; } /* * Now start a job with the Storage daemon */ - if (!start_storage_daemon_job(jcr)) { - backup_cleanup(jcr, JS_ErrorTerminated, since); - return 0; + if (!start_storage_daemon_job(jcr, jcr->storage, SD_APPEND)) { + return false; } /* - * Now start a Storage daemon message thread + * Now start a Storage daemon message thread. Note, + * this thread is used to provide the catalog services + * for the backup job, including inserting the attributes + * into the catalog. See catalog_update() in catreq.c */ if (!start_storage_daemon_message_thread(jcr)) { - backup_cleanup(jcr, JS_ErrorTerminated, since); - return 0; + return false; } + Dmsg0(150, "Storage daemon connection OK\n"); - Dmsg0(50, "Storage daemon connection OK\n"); - + set_jcr_job_status(jcr, JS_WaitFD); if (!connect_to_file_daemon(jcr, 10, FDConnectTimeout, 1)) { - backup_cleanup(jcr, JS_ErrorTerminated, since); - return 0; + return false; } - jcr->JobStatus = JS_Running; + set_jcr_job_status(jcr, JS_Running); fd = jcr->file_bsock; if (!send_include_list(jcr)) { - backup_cleanup(jcr, JS_ErrorTerminated, since); - return 0; + return false; } if (!send_exclude_list(jcr)) { - backup_cleanup(jcr, JS_ErrorTerminated, since); - return 0; + return false; + } + + if (!send_level_command(jcr)) { + return false; } - /* + /* * send Storage daemon address to the File daemon */ - if (jcr->store->SDDport == 0) { - jcr->store->SDDport = jcr->store->SDport; + store = jcr->store; + if (store->SDDport == 0) { + store->SDDport = store->SDport; } - bnet_fsend(fd, storaddr, jcr->store->address, jcr->store->SDDport); - if (!response(fd, OKstore, "Storage")) { - backup_cleanup(jcr, JS_ErrorTerminated, since); - return 0; + + /* TLS Requirement */ + if (store->tls_enable) { + if (store->tls_require) { + tls_need = BNET_TLS_REQUIRED; + } else { + tls_need = BNET_TLS_OK; + } } - /* - * Send Level command to File daemon - */ - switch (jcr->level) { - case L_FULL: - bnet_fsend(fd, levelcmd, "full", " "); - break; - case L_DIFFERENTIAL: - case L_INCREMENTAL: - bnet_fsend(fd, levelcmd, "since ", jcr->stime); - free_pool_memory(jcr->stime); - jcr->stime = NULL; - break; - case L_SINCE: - default: - Emsg1(M_FATAL, 0, _("Unimplemented backup level %d\n"), jcr->level); - backup_cleanup(jcr, JS_ErrorTerminated, since); - return 0; + bnet_fsend(fd, storaddr, store->address, store->SDDport, + tls_need); + if (!response(jcr, fd, OKstore, "Storage", DISPLAY_ERROR)) { + return false; } - Dmsg1(20, ">filed: %s", fd->msg); - if (!response(fd, OKlevel, "Level")) { - backup_cleanup(jcr, JS_ErrorTerminated, since); - return 0; + + + if (!send_run_before_and_after_commands(jcr)) { + return false; } /* Send backup command */ bnet_fsend(fd, backupcmd); - if (!response(fd, OKbackup, "backup")) { - backup_cleanup(jcr, JS_ErrorTerminated, since); - return 0; + if (!response(jcr, fd, OKbackup, "backup", DISPLAY_ERROR)) { + return false; } - /* Pickup Job termination data */ + /* Pickup Job termination data */ stat = wait_for_job_termination(jcr); - backup_cleanup(jcr, stat, since); - return 1; + if (stat == JS_Terminated) { + backup_cleanup(jcr, stat); + return true; + } + return false; } + /* - * NOTE! This is no longer really needed as the Storage - * daemon now passes this information directly - * back to us. + * Here we wait for the File daemon to signal termination, + * then we wait for the Storage daemon. When both + * are done, we return the job status. + * Also used by restore.c */ -static int wait_for_job_termination(JCR *jcr) +int wait_for_job_termination(JCR *jcr) { int32_t n = 0; BSOCK *fd = jcr->file_bsock; + bool fd_ok = false; + uint32_t JobFiles, Errors; + uint64_t ReadBytes, JobBytes; - jcr->JobStatus = JS_WaitFD; + set_jcr_job_status(jcr, JS_Running); /* Wait for Client to terminate */ - while ((n = bget_msg(fd, 0)) > 0 && !job_cancelled(jcr)) { - /* get and discard Client output */ + while ((n = bget_dirmsg(fd)) >= 0) { + if (!fd_ok && sscanf(fd->msg, EndJob, &jcr->FDJobStatus, &JobFiles, + &ReadBytes, &JobBytes, &Errors) == 5) { + fd_ok = true; + set_jcr_job_status(jcr, jcr->FDJobStatus); + Dmsg1(100, "FDStatus=%c\n", (char)jcr->JobStatus); + } else { + Jmsg(jcr, M_WARNING, 0, _("Unexpected Client Job message: %s\n"), + fd->msg); + } + if (job_canceled(jcr)) { + break; + } } - bnet_sig(fd, BNET_TERMINATE); /* tell Client we are terminating */ - if (n < 0) { - Jmsg(jcr, M_FATAL, 0, _("JobType), bnet_strerror(fd)); } + bnet_sig(fd, BNET_TERMINATE); /* tell Client we are terminating */ + + /* Note, the SD stores in jcr->JobFiles/ReadBytes/JobBytes/Errors */ + wait_for_storage_daemon_termination(jcr); + - /* Now wait for Storage daemon to terminate our message thread */ - P(jcr->mutex); - jcr->JobStatus = JS_WaitSD; - while (!jcr->msg_thread_done && !job_cancelled(jcr)) { - struct timeval tv; - struct timezone tz; - struct timespec timeout; - - gettimeofday(&tv, &tz); - timeout.tv_nsec = 0; - timeout.tv_sec = tv.tv_sec + 10; /* wait 10 seconds */ - Dmsg0(300, "I'm waiting for message thread termination.\n"); - pthread_cond_timedwait(&jcr->term_wait, &jcr->mutex, &timeout); + /* 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(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 */ + if (!fd_ok || is_bnet_error(fd)) { + jcr->FDJobStatus = JS_ErrorTerminated; + } + if (jcr->JobStatus != JS_Terminated) { + return jcr->JobStatus; } - V(jcr->mutex); - if (n < 0) { - return JS_ErrorTerminated; + if (jcr->FDJobStatus != JS_Terminated) { + return jcr->FDJobStatus; } return jcr->SDJobStatus; } @@ -345,104 +313,229 @@ static int wait_for_job_termination(JCR *jcr) /* * Release resources allocated during backup. */ -static void backup_cleanup(JCR *jcr, int TermCode, char *since) +void backup_cleanup(JCR *jcr, int TermCode) { - char sdt[50], edt[50]; - char ec1[30], ec2[30], ec3[30]; - char term_code[100]; - char *term_msg; + char sdt[50], edt[50], schedt[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]; + const char *term_msg; int msg_type; MEDIA_DBR mr; + CLIENT_DBR cr; + double kbps, compression; + utime_t RunTime; + Dmsg2(100, "Enter backup_cleanup %d %c\n", TermCode, TermCode); + dequeue_messages(jcr); /* display any queued messages */ memset(&mr, 0, sizeof(mr)); - Dmsg0(100, "Enter backup_cleanup()\n"); - if (jcr->jr.EndTime == 0) { - jcr->jr.EndTime = time(NULL); + memset(&cr, 0, sizeof(cr)); + set_jcr_job_status(jcr, TermCode); + + update_job_end_record(jcr); /* update database */ + + if (!db_get_job_record(jcr, jcr->db, &jcr->jr)) { + Jmsg(jcr, M_WARNING, 0, _("Error getting job record for stats: %s"), + db_strerror(jcr->db)); + set_jcr_job_status(jcr, JS_ErrorTerminated); } - jcr->end_time = jcr->jr.EndTime; - jcr->jr.JobId = jcr->JobId; - jcr->jr.JobStatus = jcr->JobStatus = TermCode; - jcr->jr.JobFiles = jcr->JobFiles; - jcr->jr.JobBytes = jcr->JobBytes; - jcr->jr.VolSessionId = jcr->VolSessionId; - jcr->jr.VolSessionTime = jcr->VolSessionTime; - if (!db_update_job_end_record(jcr->db, &jcr->jr)) { - Jmsg(jcr, M_WARNING, 0, _("Error updating job record. %s"), - db_strerror(jcr->db)); + + bstrncpy(cr.Name, jcr->client->hdr.name, sizeof(cr.Name)); + if (!db_get_client_record(jcr, jcr->db, &cr)) { + Jmsg(jcr, M_WARNING, 0, _("Error getting client record for stats: %s"), + db_strerror(jcr->db)); } - if (!db_get_job_record(jcr->db, &jcr->jr)) { - Jmsg(jcr, M_WARNING, 0, _("Error getting job record for stats: %s"), - db_strerror(jcr->db)); + + bstrncpy(mr.VolumeName, jcr->VolumeName, sizeof(mr.VolumeName)); + if (!db_get_media_record(jcr, jcr->db, &mr)) { + Jmsg(jcr, M_WARNING, 0, _("Error getting Media record for Volume \"%s\": ERR=%s"), + mr.VolumeName, db_strerror(jcr->db)); + set_jcr_job_status(jcr, JS_ErrorTerminated); } - strcpy(mr.VolumeName, jcr->VolumeName); - if (!db_get_media_record(jcr->db, &mr)) { - Jmsg(jcr, M_WARNING, 0, _("Error getting Media record for stats: %s"), - db_strerror(jcr->db)); + /* Now update the bootstrap file if any */ + if (jcr->JobStatus == JS_Terminated && jcr->jr.JobBytes && + jcr->job->WriteBootstrap) { + FILE *fd; + BPIPE *bpipe = NULL; + int got_pipe = 0; + char *fname = jcr->job->WriteBootstrap; + VOL_PARAMS *VolParams = NULL; + int VolCount; + + if (*fname == '|') { + fname++; + got_pipe = 1; + bpipe = open_bpipe(fname, 0, "w"); + fd = bpipe ? bpipe->wfd : NULL; + } else { + /* ***FIXME*** handle BASE */ + fd = fopen(fname, jcr->JobLevel==L_FULL?"w+":"a+"); + } + if (fd) { + 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 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 */ + fprintf(fd, "Volume=\"%s\"\n", VolParams[i].VolumeName); + fprintf(fd, "MediaType=\"%s\"\n", VolParams[i].MediaType); + fprintf(fd, "VolSessionId=%u\n", jcr->VolSessionId); + fprintf(fd, "VolSessionTime=%u\n", jcr->VolSessionTime); + fprintf(fd, "VolFile=%u-%u\n", VolParams[i].StartFile, + VolParams[i].EndFile); + fprintf(fd, "VolBlock=%u-%u\n", VolParams[i].StartBlock, + VolParams[i].EndBlock); + fprintf(fd, "FileIndex=%d-%d\n", VolParams[i].FirstIndex, + VolParams[i].LastIndex); + } + if (VolParams) { + free(VolParams); + } + if (got_pipe) { + close_bpipe(bpipe); + } else { + fclose(fd); + } + } else { + berrno be; + Jmsg(jcr, M_ERROR, 0, _("Could not open WriteBootstrap file:\n" + "%s: ERR=%s\n"), fname, be.strerror()); + set_jcr_job_status(jcr, JS_ErrorTerminated); + } } - - msg_type = M_INFO; /* by default INFO message */ - switch (TermCode) { + msg_type = M_INFO; /* by default INFO message */ + switch (jcr->JobStatus) { case JS_Terminated: - term_msg = _("Backup OK"); - break; - case JS_Errored: - term_msg = _("*** Backup Error ***"); - msg_type = M_ERROR; /* Generate error message */ - if (jcr->store_bsock) { - bnet_sig(jcr->store_bsock, BNET_TERMINATE); - pthread_cancel(jcr->SD_msg_chan); - } - break; - case JS_Cancelled: - term_msg = _("Backup Cancelled"); - if (jcr->store_bsock) { - bnet_sig(jcr->store_bsock, BNET_TERMINATE); - pthread_cancel(jcr->SD_msg_chan); - } - break; + if (jcr->Errors || jcr->SDErrors) { + term_msg = _("Backup OK -- with warnings"); + } else { + term_msg = _("Backup OK"); + } + break; + case JS_FatalError: + case JS_ErrorTerminated: + term_msg = _("*** Backup Error ***"); + msg_type = M_ERROR; /* Generate error message */ + if (jcr->store_bsock) { + bnet_sig(jcr->store_bsock, BNET_TERMINATE); + 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); + if (jcr->SD_msg_chan) { + pthread_cancel(jcr->SD_msg_chan); + } + } + break; default: - term_msg = term_code; - sprintf(term_code, _("Inappropriate term code: %c\n"), TermCode); - break; + term_msg = term_code; + sprintf(term_code, _("Inappropriate term code: %c\n"), jcr->JobStatus); + break; } - bstrftime(sdt, sizeof(sdt), jcr->jr.StartTime); - bstrftime(edt, sizeof(edt), jcr->jr.EndTime); - if (!db_get_job_volume_names(jcr->db, jcr->jr.JobId, jcr->VolumeName)) { - jcr->VolumeName[0] = 0; /* none */ + bstrftimes(schedt, sizeof(schedt), jcr->jr.SchedTime); + bstrftimes(sdt, sizeof(sdt), jcr->jr.StartTime); + bstrftimes(edt, sizeof(edt), jcr->jr.EndTime); + RunTime = jcr->jr.EndTime - jcr->jr.StartTime; + if (RunTime <= 0) { + kbps = 0; + } else { + kbps = (double)jcr->jr.JobBytes / (1000 * RunTime); + } + if (!db_get_job_volume_names(jcr, jcr->db, jcr->jr.JobId, &jcr->VolumeName)) { + /* + * Note, if the job has erred, most likely it did not write any + * tape, so suppress this "error" message since in that case + * it is normal. Or look at it the other way, only for a + * normal exit should we complain about this error. + */ + if (jcr->JobStatus == JS_Terminated && jcr->jr.JobBytes) { + Jmsg(jcr, M_ERROR, 0, "%s", db_strerror(jcr->db)); + } + jcr->VolumeName[0] = 0; /* none */ } - Jmsg(jcr, msg_type, 0, _("%s\n\ -JobId: %d\n\ -Job: %s\n\ -FileSet: %s\n\ -Backup Level: %s%s\n\ -Client: %s\n\ -Start time: %s\n\ -End time: %s\n\ -Bytes Written: %s\n\ -Files Written: %s\n\ -Volume names(s): %s\n\ -Volume Session Id: %d\n\ -Volume Session Time: %d\n\ -Volume Bytes: %s\n\ -Termination: %s\n"), - edt, - jcr->jr.JobId, - jcr->jr.Job, - jcr->fileset->hdr.name, - level_to_str(jcr->level), since, - jcr->client->hdr.name, - sdt, - edt, - edit_uint64_with_commas(jcr->jr.JobBytes, ec1), - edit_uint64_with_commas(jcr->jr.JobFiles, ec2), - jcr->VolumeName, - jcr->VolSessionId, - jcr->VolSessionTime, - edit_uint64_with_commas(mr.VolBytes, ec3), - term_msg); + if (jcr->ReadBytes == 0) { + bstrncpy(compress, "None", sizeof(compress)); + } else { + compression = (double)100 - 100.0 * ((double)jcr->JobBytes / (double)jcr->ReadBytes); + if (compression < 0.5) { + bstrncpy(compress, "None", sizeof(compress)); + } else { + bsnprintf(compress, sizeof(compress), "%.1f %%", (float)compression); + } + } + jobstatus_to_ascii(jcr->FDJobStatus, fd_term_msg, sizeof(fd_term_msg)); + jobstatus_to_ascii(jcr->SDJobStatus, sd_term_msg, sizeof(sd_term_msg)); + +// bmicrosleep(15, 0); /* for debugging SIGHUP */ + + Jmsg(jcr, msg_type, 0, _("Bacula " VERSION " (" LSMDATE "): %s\n" +" JobId: %d\n" +" Job: %s\n" +" Backup Level: %s%s\n" +" Client: \"%s\" %s\n" +" FileSet: \"%s\" %s\n" +" Pool: \"%s\"\n" +" Storage: \"%s\"\n" +" Scheduled time: %s\n" +" Start time: %s\n" +" End time: %s\n" +" Priority: %d\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" +" 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"), + edt, + jcr->jr.JobId, + jcr->jr.Job, + level_to_str(jcr->JobLevel), jcr->since, + jcr->client->hdr.name, cr.Uname, + jcr->fileset->hdr.name, jcr->FSCreateTime, + jcr->pool->hdr.name, + jcr->store->hdr.name, + schedt, + sdt, + edt, + jcr->JobPriority, + 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, + jcr->VolSessionId, + jcr->VolSessionTime, + edit_uint64_with_commas(mr.VolBytes, ec3), + jcr->Errors, + jcr->SDErrors, + fd_term_msg, + sd_term_msg, + term_msg); Dmsg0(100, "Leave backup_cleanup()\n"); }