X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fdird%2Frestore.c;h=fdb57a5e7386c72cf2de71b233509a13dc5486d6;hb=fcc920dc99e27d72ec49b2efaf822846f7bc1125;hp=b40a5dc09c2c39197b03d8763d323683b4d12262;hpb=c009afd637eecdb2cdb528a9c4646020280409fd;p=bacula%2Fbacula diff --git a/bacula/src/dird/restore.c b/bacula/src/dird/restore.c index b40a5dc09c..fdb57a5e73 100644 --- a/bacula/src/dird/restore.c +++ b/bacula/src/dird/restore.c @@ -1,10 +1,37 @@ +/* + Bacula® - The Network Backup Solution + + Copyright (C) 2000-2010 Free Software Foundation Europe e.V. + + The main author of Bacula is Kern Sibbald, with contributions from + many others, a complete list can be found in the file AUTHORS. + This program is Free Software; you can redistribute it and/or + modify it under the terms of version three of the GNU Affero General Public + License as published by the Free Software Foundation and included + in the file LICENSE. + + 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 Affero General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. + + Bacula® is a registered trademark of Kern Sibbald. + The licensor of Bacula is the Free Software Foundation Europe + (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich, + Switzerland, email:ftf@fsfeurope.org. +*/ /* * Bacula Director -- restore.c -- responsible for restoring files * * Kern Sibbald, November MM * - * This routine is run as a separate thread. - * + * This routine is run as a separate thread. + * * Current implementation is Catalog verification only (i.e. no * verification versus tape). * @@ -12,288 +39,540 @@ * Open DB * 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 restore. + * to do the restore. * Update the DB according to what files where restored???? * - * Version $Id$ */ -/* - 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 - published by the Free Software Foundation; either version 2 of - the License, or (at your option) any later version. - - 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. - - */ #include "bacula.h" #include "dird.h" /* Commands sent to File daemon */ -static char restorecmd[] = "restore replace=%c prelinks=%d where=%s\n"; -static char storaddr[] = "storage address=%s port=%d ssl=0\n"; -static char sessioncmd[] = "session %s %ld %ld %ld %ld %ld %ld\n"; +static char restorecmd[] = "restore replace=%c prelinks=%d where=%s\n"; +static char restorecmdR[] = "restore replace=%c prelinks=%d regexwhere=%s\n"; +static char storaddr[] = "storage address=%s port=%d ssl=0 Authorization=%s\n"; /* Responses received from File daemon */ static char OKrestore[] = "2000 OK restore\n"; static char OKstore[] = "2000 OK storage\n"; -static char OKsession[] = "2000 OK session\n"; +static char OKstoreend[] = "2000 OK storage end\n"; + +/* Responses received from the Storage daemon */ +static char OKbootstrap[] = "3000 OK bootstrap\n"; -/* Forward referenced functions */ -static void restore_cleanup(JCR *jcr, int status); +static void build_restore_command(JCR *jcr, POOL_MEM &ret) +{ + char replace, *where, *cmd; + char empty = '\0'; -/* External functions */ + /* Build the restore command */ -/* - * Do a restore of the specified files - * - * Returns: 0 on failure - * 1 on success + if (jcr->replace != 0) { + replace = jcr->replace; + } else if (jcr->job->replace != 0) { + replace = jcr->job->replace; + } else { + replace = REPLACE_ALWAYS; /* always replace */ + } + + if (jcr->RegexWhere) { + where = jcr->RegexWhere; /* override */ + cmd = restorecmdR; + } else if (jcr->job->RegexWhere) { + where = jcr->job->RegexWhere; /* no override take from job */ + cmd = restorecmdR; + + } else if (jcr->where) { + where = jcr->where; /* override */ + cmd = restorecmd; + } else if (jcr->job->RestoreWhere) { + where = jcr->job->RestoreWhere; /* no override take from job */ + cmd = restorecmd; + + } else { /* nothing was specified */ + where = ∅ /* use default */ + cmd = restorecmd; + } + + jcr->prefix_links = jcr->job->PrefixLinks; + + bash_spaces(where); + Mmsg(ret, cmd, replace, jcr->prefix_links, where); + unbash_spaces(where); +} + +struct bootstrap_info +{ + FILE *bs; + UAContext *ua; + char storage[MAX_NAME_LENGTH+1]; +}; + +#define UA_CMD_SIZE 1000 + +/* Open the bootstrap file and find the first Storage= + * Returns ok if able to open + * It fills the storage name (should be the first line) + * and the file descriptor to the bootstrap file, + * it should be used for next operations, and need to be closed + * at the end. */ -int do_restore(JCR *jcr) +static bool open_bootstrap_file(JCR *jcr, bootstrap_info &info) { - BSOCK *fd; - JOB_DBR rjr; /* restore job record */ + FILE *bs; + UAContext *ua; + info.bs = NULL; + info.ua = NULL; - if (!get_or_create_client_record(jcr)) { - restore_cleanup(jcr, JS_ErrorTerminated); - return 0; + if (!jcr->RestoreBootstrap) { + return false; + } + strncpy(info.storage, jcr->rstore->name(), MAX_NAME_LENGTH); + + bs = fopen(jcr->RestoreBootstrap, "rb"); + if (!bs) { + berrno be; + Jmsg(jcr, M_FATAL, 0, _("Could not open bootstrap file %s: ERR=%s\n"), + jcr->RestoreBootstrap, be.bstrerror()); + set_jcr_job_status(jcr, JS_ErrorTerminated); + return false; } - memset(&rjr, 0, sizeof(rjr)); - jcr->jr.Level = 'F'; /* Full restore */ - jcr->jr.StartTime = jcr->start_time; - if (!db_update_job_start_record(jcr, jcr->db, &jcr->jr)) { - Jmsg(jcr, M_ERROR, 0, "%s", db_strerror(jcr->db)); - restore_cleanup(jcr, JS_ErrorTerminated); - return 0; + ua = new_ua_context(jcr); + ua->cmd = check_pool_memory_size(ua->cmd, UA_CMD_SIZE+1); + while (!fgets(ua->cmd, UA_CMD_SIZE, bs)) { + parse_ua_args(ua); + if (ua->argc != 1) { + continue; + } + if (!strcasecmp(ua->argk[0], "Storage")) { + strncpy(info.storage, ua->argv[0], MAX_NAME_LENGTH); + break; + } } - Dmsg0(20, "Updated job start record\n"); - jcr->fname = (char *) get_pool_memory(PM_FNAME); + info.bs = bs; + info.ua = ua; + fseek(bs, 0, SEEK_SET); /* return to the top of the file */ + return true; +} - Dmsg1(20, "RestoreJobId=%d\n", jcr->job->RestoreJobId); +/* + * This function compare the given storage name with the + * the current one. We compare the name and the address:port. + * Returns true if we use the same storage. + */ +static bool is_on_same_storage(JCR *jcr, char *new_one) +{ + STORE *new_store; - /* - * The following code is kept temporarily for compatibility. - * It is the predecessor to the Bootstrap file. + /* with old FD, we send the whole bootstrap to the storage */ + if (jcr->FDVersion < 2) { + return true; + } + /* we are in init loop ? shoudn't fall here */ + if (!*new_one) { + return true; + } + /* same name */ + if (!strcmp(new_one, jcr->rstore->name())) { + return true; + } + new_store = (STORE *)GetResWithName(R_STORAGE, new_one); + if (!new_store) { + Jmsg(jcr, M_FATAL, 0, + _("Could not get storage resource '%s'.\n"), new_one); + set_jcr_job_status(jcr, JS_ErrorTerminated); + return false; + } + /* if Port and Hostname/IP are same, we are talking to the same + * Storage Daemon */ - if (!jcr->RestoreBootstrap) { - /* - * Find Job Record for Files to be restored - */ - if (jcr->RestoreJobId != 0) { - rjr.JobId = jcr->RestoreJobId; /* specified by UA */ - } else { - rjr.JobId = jcr->job->RestoreJobId; /* specified by Job Resource */ - } - if (!db_get_job_record(jcr, jcr->db, &rjr)) { - Jmsg2(jcr, M_FATAL, 0, _("Cannot get job record id=%d %s"), rjr.JobId, - db_strerror(jcr->db)); - restore_cleanup(jcr, JS_ErrorTerminated); - return 0; + if (jcr->rstore->SDport != new_store->SDport || + strcmp(jcr->rstore->address, new_store->address)) + { + return false; + } + return true; +} + +/* + * Check if the current line contains Storage="xxx", and compare the + * result to the current storage. We use UAContext to analyse the bsr + * string. + * + * Returns true if we need to change the storage, and it set the new + * Storage resource name in "storage" arg. + */ +static bool check_for_new_storage(JCR *jcr, bootstrap_info &info) +{ + UAContext *ua = info.ua; + parse_ua_args(ua); + if (ua->argc != 1) { + return false; + } + if (!strcasecmp(ua->argk[0], "Storage")) { + /* Continue if this is a volume from the same storage. */ + if (is_on_same_storage(jcr, ua->argv[0])) { + return false; } + /* note the next storage name */ + strncpy(info.storage, ua->argv[0], MAX_NAME_LENGTH); + Dmsg1(5, "Change storage to %s\n", info.storage); + return true; + } + return false; +} - /* - * Now find the Volumes we will need for the Restore - */ - jcr->VolumeName[0] = 0; - if (!db_get_job_volume_names(jcr, jcr->db, rjr.JobId, &jcr->VolumeName) || - jcr->VolumeName[0] == 0) { - Jmsg(jcr, M_FATAL, 0, _("Cannot find Volume Name for restore Job %d. %s"), - rjr.JobId, db_strerror(jcr->db)); - restore_cleanup(jcr, JS_ErrorTerminated); - return 0; +/* + * Send bootstrap file to Storage daemon section by section. + */ +static bool send_bootstrap_file(JCR *jcr, BSOCK *sock, + bootstrap_info &info) +{ + boffset_t pos; + const char *bootstrap = "bootstrap\n"; + UAContext *ua = info.ua; + FILE *bs = info.bs; + + Dmsg1(400, "send_bootstrap_file: %s\n", jcr->RestoreBootstrap); + if (!jcr->RestoreBootstrap) { + return false; + } + sock->fsend(bootstrap); + pos = ftello(bs); + while(fgets(ua->cmd, UA_CMD_SIZE, bs)) { + if (check_for_new_storage(jcr, info)) { + /* Otherwise, we need to contact another storage daemon. + * Reset bs to the beginning of the current segment. + */ + fseeko(bs, pos, SEEK_SET); + break; } - Dmsg1(20, "Got job Volume Names: %s\n", jcr->VolumeName); + sock->fsend("%s", ua->cmd); + pos = ftello(bs); } - + sock->signal(BNET_EOD); + return true; +} - /* Print Job Start message */ - Jmsg(jcr, M_INFO, 0, _("Start Restore Job %s\n"), jcr->Job); +#define MAX_TRIES 6 * 360 /* 6 hours */ +/** + * Change the read storage resource for the current job. + */ +static bool select_rstore(JCR *jcr, bootstrap_info &info) +{ + USTORE ustore; + int i; + + if (!strcmp(jcr->rstore->name(), info.storage)) { + return true; /* same SD nothing to change */ + } + + if (!(ustore.store = (STORE *)GetResWithName(R_STORAGE,info.storage))) { + Jmsg(jcr, M_FATAL, 0, + _("Could not get storage resource '%s'.\n"), info.storage); + set_jcr_job_status(jcr, JS_ErrorTerminated); + return false; + } + /* - * Open a message channel connection with the Storage - * daemon. This is to let him know that our client - * will be contacting him for a backup session. - * - */ - Dmsg0(10, "Open connection with storage daemon\n"); - set_jcr_job_status(jcr, JS_WaitSD); - /* - * Start conversation with Storage daemon + * What does this do??????????? KES */ - if (!connect_to_storage_daemon(jcr, 10, SDConnectTimeout, 1)) { - restore_cleanup(jcr, JS_ErrorTerminated); - return 0; + if (jcr->store_bsock) { + jcr->store_bsock->destroy(); + jcr->store_bsock = NULL; } + /* - * Now start a job with the Storage daemon + * release current read storage and get a new one */ - if (!start_storage_daemon_job(jcr)) { - restore_cleanup(jcr, JS_ErrorTerminated); - return 0; - } + dec_read_store(jcr); + free_rstorage(jcr); + set_rstorage(jcr, &ustore); + set_jcr_job_status(jcr, JS_WaitSD); /* - * Now start a Storage daemon message thread + * Wait for up to 6 hours to increment read stoage counter */ - if (!start_storage_daemon_message_thread(jcr)) { - restore_cleanup(jcr, JS_ErrorTerminated); - return 0; + for (i=0; i < MAX_TRIES; i++) { + /* try to get read storage counter incremented */ + if (inc_read_store(jcr)) { + set_jcr_job_status(jcr, JS_Running); + return true; + } + bmicrosleep(10, 0); /* sleep 10 secs */ + if (job_canceled(jcr)) { + free_rstorage(jcr); + return false; + } } - Dmsg0(50, "Storage daemon connection OK\n"); + /* Failed to inc_read_store() */ + free_rstorage(jcr); + Jmsg(jcr, M_FATAL, 0, + _("Could not acquire read storage lock for \"%s\""), info.storage); + return false; +} - /* - * Start conversation with File daemon - */ - set_jcr_job_status(jcr, JS_WaitFD); - if (!connect_to_file_daemon(jcr, 10, FDConnectTimeout, 1)) { - restore_cleanup(jcr, JS_ErrorTerminated); - return 0; +/* + * Clean the bootstrap_info struct + */ +static void close_bootstrap_file(bootstrap_info &info) +{ + if (info.bs) { + fclose(info.bs); } - - fd = jcr->file_bsock; - set_jcr_job_status(jcr, JS_Running); - - if (!send_include_list(jcr)) { - restore_cleanup(jcr, JS_ErrorTerminated); - return 0; + if (info.ua) { + free_ua_context(info.ua); } +} - if (!send_exclude_list(jcr)) { - restore_cleanup(jcr, JS_ErrorTerminated); - return 0; +/* + * Take a bootstrap and for each different storage, we change the storage + * resource and start a new restore session between the client and the storage + * + */ +bool restore_bootstrap(JCR *jcr) +{ + BSOCK *fd = NULL, *sd; + bool end_loop = false; + bool first_time = true; + bootstrap_info info; + POOL_MEM restore_cmd(PM_MESSAGE); + bool ret = false; + + /* this command is used for each part */ + build_restore_command(jcr, restore_cmd); + + if (!open_bootstrap_file(jcr, info)) { + goto bail_out; } + while (!end_loop && !feof(info.bs)) { + + if (!select_rstore(jcr, info)) { + goto bail_out; + } - /* - * send Storage daemon address to the File daemon, - * then wait for File daemon to make connection - * with Storage daemon. - */ - if (jcr->store->SDDport == 0) { - jcr->store->SDDport = jcr->store->SDport; - } - bnet_fsend(fd, storaddr, jcr->store->address, jcr->store->SDDport); - Dmsg1(6, "dird>filed: %s\n", fd->msg); - if (!response(jcr, fd, OKstore, "Storage", DISPLAY_ERROR)) { - restore_cleanup(jcr, JS_ErrorTerminated); - return 0; - } + /* + * Open a message channel connection with the Storage + * daemon. This is to let him know that our client + * will be contacting him for a backup session. + * + */ + Dmsg0(10, "Open connection with storage daemon\n"); + set_jcr_job_status(jcr, JS_WaitSD); + /* + * Start conversation with Storage daemon + */ + if (!connect_to_storage_daemon(jcr, 10, SDConnectTimeout, 1)) { + goto bail_out; + } + sd = jcr->store_bsock; + /* + * Now start a job with the Storage daemon + */ + if (!start_storage_daemon_job(jcr, jcr->rstorage, NULL)) { + goto bail_out; + } - /* - * Send the bootstrap file -- what Volumes/files to restore - */ - if (!send_bootstrap_file(jcr)) { - restore_cleanup(jcr, JS_ErrorTerminated); - return 0; - } + if (first_time) { + /* + * Start conversation with File daemon + */ + set_jcr_job_status(jcr, JS_WaitFD); + jcr->keep_sd_auth_key = true; /* don't clear the sd_auth_key now */ + if (!connect_to_file_daemon(jcr, 10, FDConnectTimeout, 1)) { + goto bail_out; + } + + fd = jcr->file_bsock; + } + + set_jcr_job_status(jcr, JS_WaitSD); - /* - * The following code is deprecated - */ - if (!jcr->RestoreBootstrap) { /* - * Pass the VolSessionId, VolSessionTime, Start and - * end File and Blocks on the session command. + * Send the bootstrap file -- what Volumes/files to restore */ - bnet_fsend(fd, sessioncmd, - jcr->VolumeName, - rjr.VolSessionId, rjr.VolSessionTime, - rjr.StartFile, rjr.EndFile, rjr.StartBlock, - rjr.EndBlock); - if (!response(jcr, fd, OKsession, "Session", DISPLAY_ERROR)) { - restore_cleanup(jcr, JS_ErrorTerminated); - return 0; + if (!send_bootstrap_file(jcr, sd, info) || + !response(jcr, sd, OKbootstrap, "Bootstrap", DISPLAY_ERROR)) { + goto bail_out; } - } - if (!send_run_before_and_after_commands(jcr)) { - restore_cleanup(jcr, JS_ErrorTerminated); - return 0; + if (!sd->fsend("run")) { + goto bail_out; + } + /* + * Now start a Storage daemon message thread + */ + if (!start_storage_daemon_message_thread(jcr)) { + goto bail_out; + } + Dmsg0(50, "Storage daemon connection OK\n"); + + /* + * send Storage daemon address to the File daemon, + * then wait for File daemon to make connection + * with Storage daemon. + */ + if (jcr->rstore->SDDport == 0) { + jcr->rstore->SDDport = jcr->rstore->SDport; + } + fd->fsend(storaddr, jcr->rstore->address, jcr->rstore->SDDport, + jcr->sd_auth_key); + memset(jcr->sd_auth_key, 0, strlen(jcr->sd_auth_key)); + + Dmsg1(6, "dird>filed: %s\n", fd->msg); + if (!response(jcr, fd, OKstore, "Storage", DISPLAY_ERROR)) { + goto bail_out; + } + + if (first_time) { + if (!send_runscripts_commands(jcr)) { + goto bail_out; + } + first_time=false; + } + + fd->fsend("%s", restore_cmd.c_str()); + + if (!response(jcr, fd, OKrestore, "Restore", DISPLAY_ERROR)) { + goto bail_out; + } + + if (jcr->FDVersion < 2) { /* Old FD */ + end_loop=true; /* we do only one loop */ + + } else { + if (!response(jcr, fd, OKstoreend, "Store end", DISPLAY_ERROR)) { + goto bail_out; + } + wait_for_storage_daemon_termination(jcr); + } + } /* the whole boostrap has been send */ + + if (fd && jcr->FDVersion >= 2) { + fd->fsend("endrestore"); } - /* Send restore command */ - char replace, *where; + ret = true; - if (jcr->replace != 0) { - replace = jcr->replace; - } else if (jcr->job->replace != 0) { - replace = jcr->job->replace; - } else { - replace = REPLACE_ALWAYS; /* always replace */ +bail_out: + close_bootstrap_file(info); + return ret; +} + +/* + * Do a restore of the specified files + * + * Returns: 0 on failure + * 1 on success + */ +bool do_restore(JCR *jcr) +{ + JOB_DBR rjr; /* restore job record */ + int stat; + + free_wstorage(jcr); /* we don't write */ + + if (!allow_duplicate_job(jcr)) { + goto bail_out; } - if (jcr->where) { - where = jcr->where; /* override */ - } else if (jcr->job->RestoreWhere) { - where = jcr->job->RestoreWhere; /* no override take from job */ - } else { - where = ""; /* None */ + + memset(&rjr, 0, sizeof(rjr)); + jcr->jr.JobLevel = L_FULL; /* Full restore */ + if (!db_update_job_start_record(jcr, jcr->db, &jcr->jr)) { + Jmsg(jcr, M_FATAL, 0, "%s", db_strerror(jcr->db)); + goto bail_out; } - jcr->prefix_links = jcr->job->PrefixLinks; - bash_spaces(where); - bnet_fsend(fd, restorecmd, replace, jcr->prefix_links, where); - unbash_spaces(where); + Dmsg0(20, "Updated job start record\n"); + + Dmsg1(20, "RestoreJobId=%d\n", jcr->job->RestoreJobId); - if (!response(jcr, fd, OKrestore, "Restore", DISPLAY_ERROR)) { - restore_cleanup(jcr, JS_ErrorTerminated); - return 0; + if (!jcr->RestoreBootstrap) { + Jmsg(jcr, M_FATAL, 0, _("Cannot restore without a bootstrap file.\n" + "You probably ran a restore job directly. All restore jobs must\n" + "be run using the restore command.\n")); + goto bail_out; + } + + + /* Print Job Start message */ + Jmsg(jcr, M_INFO, 0, _("Start Restore Job %s\n"), jcr->Job); + + if (!restore_bootstrap(jcr)) { + goto bail_out; } /* Wait for Job Termination */ - int stat = wait_for_job_termination(jcr); + stat = wait_for_job_termination(jcr); restore_cleanup(jcr, stat); + return true; - return 1; +bail_out: + restore_cleanup(jcr, JS_ErrorTerminated); + return false; +} + +bool do_restore_init(JCR *jcr) +{ + free_wstorage(jcr); + return true; } /* * Release resources allocated during restore. * */ -static void restore_cleanup(JCR *jcr, int TermCode) +void restore_cleanup(JCR *jcr, int TermCode) { char sdt[MAX_TIME_LENGTH], edt[MAX_TIME_LENGTH]; - char ec1[30], ec2[30]; + char ec1[30], ec2[30], ec3[30]; char term_code[100], fd_term_msg[100], sd_term_msg[100]; - char *term_msg; - int msg_type; + const char *term_msg; + int msg_type = M_INFO; double kbps; Dmsg0(20, "In restore_cleanup\n"); - set_jcr_job_status(jcr, TermCode); + update_job_end(jcr, TermCode); + + if (jcr->unlink_bsr && jcr->RestoreBootstrap) { + unlink(jcr->RestoreBootstrap); + jcr->unlink_bsr = false; + } - update_job_end_record(jcr); + if (job_canceled(jcr)) { + cancel_storage_daemon_job(jcr); + } - msg_type = M_INFO; /* by default INFO message */ switch (TermCode) { case JS_Terminated: - term_msg = _("Restore OK"); + if (jcr->ExpectedFiles > jcr->jr.JobFiles) { + term_msg = _("Restore OK -- warning file count mismatch"); + } else { + term_msg = _("Restore OK"); + } break; + case JS_Warnings: + term_msg = _("Restore OK -- with warnings"); + break; case JS_FatalError: case JS_ErrorTerminated: - term_msg = _("*** Restore Error ***"); - msg_type = M_ERROR; /* Generate error message */ + term_msg = _("*** Restore 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); + jcr->store_bsock->signal(BNET_TERMINATE); + if (jcr->SD_msg_chan) { + pthread_cancel(jcr->SD_msg_chan); + } } break; case JS_Canceled: term_msg = _("Restore Canceled"); if (jcr->store_bsock) { - bnet_sig(jcr->store_bsock, BNET_TERMINATE); - pthread_cancel(jcr->SD_msg_chan); + jcr->store_bsock->signal(BNET_TERMINATE); + if (jcr->SD_msg_chan) { + pthread_cancel(jcr->SD_msg_chan); + } } break; default: @@ -301,8 +580,8 @@ static void restore_cleanup(JCR *jcr, int TermCode) sprintf(term_code, _("Inappropriate term code: %c\n"), TermCode); break; } - bstrftime(sdt, sizeof(sdt), jcr->jr.StartTime); - bstrftime(edt, sizeof(edt), jcr->jr.EndTime); + bstrftimes(sdt, sizeof(sdt), jcr->jr.StartTime); + bstrftimes(edt, sizeof(edt), jcr->jr.EndTime); if (jcr->jr.EndTime - jcr->jr.StartTime > 0) { kbps = (double)jcr->jr.JobBytes / (1000 * (jcr->jr.EndTime - jcr->jr.StartTime)); } else { @@ -315,32 +594,36 @@ static void restore_cleanup(JCR *jcr, int TermCode) jobstatus_to_ascii(jcr->FDJobStatus, fd_term_msg, sizeof(fd_term_msg)); jobstatus_to_ascii(jcr->SDJobStatus, sd_term_msg, sizeof(sd_term_msg)); - Jmsg(jcr, msg_type, 0, _("Bacula " VERSION " (" LSMDATE "): %s\n\ -JobId: %d\n\ -Job: %s\n\ -Client: %s\n\ -Start time: %s\n\ -End time: %s\n\ -Files Restored: %s\n\ -Bytes Restored: %s\n\ -Rate: %.1f KB/s\n\ -Non-fatal FD Errors: %d\n\ -FD termination status: %s\n\ -SD termination status: %s\n\ -Termination: %s\n\n"), - edt, - jcr->jr.JobId, - jcr->jr.Job, - jcr->client->hdr.name, - sdt, - edt, - edit_uint64_with_commas((uint64_t)jcr->jr.JobFiles, ec1), - edit_uint64_with_commas(jcr->jr.JobBytes, ec2), - (float)kbps, - jcr->Errors, - fd_term_msg, - sd_term_msg, - term_msg); + Jmsg(jcr, msg_type, 0, _("%s %s %s (%s): %s\n" +" Build OS: %s %s %s\n" +" JobId: %d\n" +" Job: %s\n" +" Restore Client: %s\n" +" Start time: %s\n" +" End time: %s\n" +" Files Expected: %s\n" +" Files Restored: %s\n" +" Bytes Restored: %s\n" +" Rate: %.1f KB/s\n" +" FD Errors: %d\n" +" FD termination status: %s\n" +" SD termination status: %s\n" +" Termination: %s\n\n"), + BACULA, my_name, VERSION, LSMDATE, edt, + HOST_OS, DISTNAME, DISTVER, + jcr->jr.JobId, + jcr->jr.Job, + jcr->client->name(), + sdt, + edt, + edit_uint64_with_commas((uint64_t)jcr->ExpectedFiles, ec1), + edit_uint64_with_commas((uint64_t)jcr->jr.JobFiles, ec2), + edit_uint64_with_commas(jcr->jr.JobBytes, ec3), + (float)kbps, + jcr->JobErrors, + fd_term_msg, + sd_term_msg, + term_msg); Dmsg0(20, "Leaving restore_cleanup\n"); }