X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fdird%2Fbsr.c;h=4e03daa5a257079118b3b929e9f2ddbc160b7ee4;hb=6e637fce30a1fdbc2da43552f513f529db4d4e87;hp=ae4317c452fac02771976d7dc3cad667c2796f41;hpb=7313af1d71e8bc6c95792526d437973369ab5a35;p=bacula%2Fbacula diff --git a/bacula/src/dird/bsr.c b/bacula/src/dird/bsr.c index ae4317c452..4e03daa5a2 100644 --- a/bacula/src/dird/bsr.c +++ b/bacula/src/dird/bsr.c @@ -9,21 +9,33 @@ * * Version $Id$ */ - /* - Copyright (C) 2002-2006 Kern Sibbald + Bacula® - The Network Backup Solution - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - version 2 as amended with additional clauses defined in the - file LICENSE in the main source directory. + Copyright (C) 2002-2006 Free Software Foundation Europe e.V. - 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 - the file LICENSE for additional details. + 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 two of the GNU 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 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 John Walker. + The licensor of Bacula is the Free Software Foundation Europe + (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich, + Switzerland, email:ftf@fsfeurope.org. +*/ #include "bacula.h" #include "dird.h" @@ -84,7 +96,7 @@ static bool get_storage_device(char *device, char *storage) * We are called here once for each JobMedia record * for each Volume. */ -static uint32_t write_findex(UAContext *ua, RBSR_FINDEX *fi, +static uint32_t write_findex(RBSR_FINDEX *fi, int32_t FirstIndex, int32_t LastIndex, FILE *fd) { uint32_t count = 0; @@ -128,13 +140,13 @@ static bool is_volume_selected(RBSR_FINDEX *fi, static void print_findex(UAContext *ua, RBSR_FINDEX *fi) { - bsendmsg(ua, "fi=0x%lx\n", fi); + ua->send_msg("fi=0x%lx\n", fi); for ( ; fi; fi=fi->next) { if (fi->findex == fi->findex2) { - bsendmsg(ua, "FileIndex=%d\n", fi->findex); + ua->send_msg("FileIndex=%d\n", fi->findex); Dmsg1(1000, "FileIndex=%d\n", fi->findex); } else { - bsendmsg(ua, "FileIndex=%d-%d\n", fi->findex, fi->findex2); + ua->send_msg("FileIndex=%d-%d\n", fi->findex, fi->findex2); Dmsg2(1000, "FileIndex=%d-%d\n", fi->findex, fi->findex2); } } @@ -173,14 +185,14 @@ bool complete_bsr(UAContext *ua, RBSR *bsr) memset(&jr, 0, sizeof(jr)); jr.JobId = bsr->JobId; if (!db_get_job_record(ua->jcr, ua->db, &jr)) { - bsendmsg(ua, _("Unable to get Job record. ERR=%s\n"), db_strerror(ua->db)); + ua->error_msg(_("Unable to get Job record. ERR=%s\n"), db_strerror(ua->db)); return false; } bsr->VolSessionId = jr.VolSessionId; bsr->VolSessionTime = jr.VolSessionTime; if ((bsr->VolCount=db_get_job_volume_parameters(ua->jcr, ua->db, bsr->JobId, &(bsr->VolParams))) == 0) { - bsendmsg(ua, _("Unable to get Job Volume Parameters. ERR=%s\n"), db_strerror(ua->db)); + ua->error_msg(_("Unable to get Job Volume Parameters. ERR=%s\n"), db_strerror(ua->db)); if (bsr->VolParams) { free(bsr->VolParams); bsr->VolParams = NULL; @@ -194,7 +206,7 @@ bool complete_bsr(UAContext *ua, RBSR *bsr) static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; static uint32_t uniq = 0; -void make_unique_restore_filename(UAContext *ua, POOLMEM **fname) +static void make_unique_restore_filename(UAContext *ua, POOL_MEM &fname) { JCR *jcr = ua->jcr; int i = find_arg_with_value(ua, "bootstrap"); @@ -211,7 +223,7 @@ void make_unique_restore_filename(UAContext *ua, POOLMEM **fname) if (jcr->RestoreBootstrap) { free(jcr->RestoreBootstrap); } - jcr->RestoreBootstrap = bstrdup(*fname); + jcr->RestoreBootstrap = bstrdup(fname.c_str()); } /* @@ -220,36 +232,44 @@ void make_unique_restore_filename(UAContext *ua, POOLMEM **fname) uint32_t write_bsr_file(UAContext *ua, RESTORE_CTX &rx) { FILE *fd; - POOLMEM *fname = get_pool_memory(PM_MESSAGE); + POOL_MEM fname(PM_MESSAGE); + POOL_MEM volmsg(PM_MESSAGE); uint32_t count = 0;; bool err; char *p; JobId_t JobId; + char Device[MAX_NAME_LENGTH]; - make_unique_restore_filename(ua, &fname); - fd = fopen(fname, "w+b"); + make_unique_restore_filename(ua, fname); + fd = fopen(fname.c_str(), "w+b"); if (!fd) { berrno be; - bsendmsg(ua, _("Unable to create bootstrap file %s. ERR=%s\n"), - fname, be.strerror()); + ua->error_msg(_("Unable to create bootstrap file %s. ERR=%s\n"), + fname.c_str(), be.bstrerror()); goto bail_out; } /* Write them to file */ count = write_bsr(ua, rx, fd); err = ferror(fd); fclose(fd); + if (count == 0) { + ua->info_msg(_("No files found to restore/migrate. No bootstrap file written.\n")); + goto bail_out; + } if (err) { - bsendmsg(ua, _("Error writing bsr file.\n")); + ua->error_msg(_("Error writing bsr file.\n")); count = 0; goto bail_out; } - bsendmsg(ua, _("Bootstrap records written to %s\n"), fname); + ua->send_msg(_("Bootstrap records written to %s\n"), fname.c_str()); /* Tell the user what he will need to mount */ - bsendmsg(ua, "\n"); - bsendmsg(ua, _("The job will require the following Volumes:\n")); + ua->send_msg("\n"); + ua->send_msg(_("The job will require the following\n" + " Volume(s) Storage(s) SD Device(s)\n" + "===========================================================================\n")); /* Create Unique list of Volumes using prompt list */ start_prompt(ua, ""); if (*rx.JobIds) { @@ -261,7 +281,13 @@ uint32_t write_bsr_file(UAContext *ua, RESTORE_CTX &rx) } for (int i=0; i < nbsr->VolCount; i++) { if (nbsr->VolParams[i].VolumeName[0]) { - add_prompt(ua, nbsr->VolParams[i].VolumeName); + if (!get_storage_device(Device, nbsr->VolParams[i].Storage)) { + Device[0] = 0; + } + Mmsg(volmsg, "%-25.25s %-25.25s %-25.25s", + nbsr->VolParams[i].VolumeName, + nbsr->VolParams[i].Storage, Device); + add_prompt(ua, volmsg.c_str()); } } } @@ -271,24 +297,29 @@ uint32_t write_bsr_file(UAContext *ua, RESTORE_CTX &rx) for (RBSR *nbsr=rx.bsr; nbsr; nbsr=nbsr->next) { for (int i=0; i < nbsr->VolCount; i++) { if (nbsr->VolParams[i].VolumeName[0]) { - add_prompt(ua, nbsr->VolParams[i].VolumeName); + if (!get_storage_device(Device, nbsr->VolParams[i].Storage)) { + Device[0] = 0; + } + Mmsg(volmsg, "%-25.25s %-25.25s %-25.25s", + nbsr->VolParams[i].VolumeName, + nbsr->VolParams[i].Storage, Device); + add_prompt(ua, volmsg.c_str()); } } } } for (int i=0; i < ua->num_prompts; i++) { - bsendmsg(ua, " %s\n", ua->prompt[i]); + ua->send_msg(" %s\n", ua->prompt[i]); free(ua->prompt[i]); } if (ua->num_prompts == 0) { - bsendmsg(ua, _("No Volumes found to restore.\n")); + ua->send_msg(_("No Volumes found to restore.\n")); count = 0; } ua->num_prompts = 0; - bsendmsg(ua, "\n"); + ua->send_msg("\n"); bail_out: - free_pool_memory(fname); return count; } @@ -322,6 +353,10 @@ static uint32_t write_bsr(UAContext *ua, RESTORE_CTX &rx, FILE *fd) bsr->VolParams[i].VolumeName[0] = 0; /* zap VolumeName */ continue; } + if (!rx.store) { + find_storage_resource(ua, rx, bsr->VolParams[i].Storage, + bsr->VolParams[i].MediaType); + } fprintf(fd, "Volume=\"%s\"\n", bsr->VolParams[i].VolumeName); fprintf(fd, "MediaType=\"%s\"\n", bsr->VolParams[i].MediaType); if (get_storage_device(device, bsr->VolParams[i].Storage)) { @@ -347,7 +382,7 @@ static uint32_t write_bsr(UAContext *ua, RESTORE_CTX &rx, FILE *fd) // Dmsg2(100, "bsr VolParam FI=%u LI=%u\n", // bsr->VolParams[i].FirstIndex, bsr->VolParams[i].LastIndex); - count = write_findex(ua, bsr->fi, bsr->VolParams[i].FirstIndex, + count = write_findex(bsr->fi, bsr->VolParams[i].FirstIndex, bsr->VolParams[i].LastIndex, fd); if (count) { fprintf(fd, "Count=%u\n", count); @@ -381,6 +416,10 @@ static uint32_t write_bsr(UAContext *ua, RESTORE_CTX &rx, FILE *fd) bsr->VolParams[i].VolumeName[0] = 0; /* zap VolumeName */ continue; } + if (!rx.store) { + find_storage_resource(ua, rx, bsr->VolParams[i].Storage, + bsr->VolParams[i].MediaType); + } fprintf(fd, "Volume=\"%s\"\n", bsr->VolParams[i].VolumeName); fprintf(fd, "MediaType=\"%s\"\n", bsr->VolParams[i].MediaType); if (get_storage_device(device, bsr->VolParams[i].Storage)) { @@ -406,7 +445,7 @@ static uint32_t write_bsr(UAContext *ua, RESTORE_CTX &rx, FILE *fd) // Dmsg2(100, "bsr VolParam FI=%u LI=%u\n", // bsr->VolParams[i].FirstIndex, bsr->VolParams[i].LastIndex); - count = write_findex(ua, bsr->fi, bsr->VolParams[i].FirstIndex, + count = write_findex(bsr->fi, bsr->VolParams[i].FirstIndex, bsr->VolParams[i].LastIndex, fd); if (count) { fprintf(fd, "Count=%u\n", count); @@ -431,13 +470,13 @@ void print_bsr(UAContext *ua, RBSR *bsr) { for ( ; bsr; bsr=bsr->next) { for (int i=0; i < bsr->VolCount; i++) { - bsendmsg(ua, "Volume=\"%s\"\n", bsr->VolParams[i].VolumeName); - bsendmsg(ua, "MediaType\"%s\"\n", bsr->VolParams[i].MediaType); - bsendmsg(ua, "VolSessionId=%u\n", bsr->VolSessionId); - bsendmsg(ua, "VolSessionTime=%u\n", bsr->VolSessionTime); - bsendmsg(ua, "VolFile=%u-%u\n", bsr->VolParams[i].StartFile, + ua->send_msg("Volume=\"%s\"\n", bsr->VolParams[i].VolumeName); + ua->send_msg("MediaType\"%s\"\n", bsr->VolParams[i].MediaType); + ua->send_msg("VolSessionId=%u\n", bsr->VolSessionId); + ua->send_msg("VolSessionTime=%u\n", bsr->VolSessionTime); + ua->send_msg("VolFile=%u-%u\n", bsr->VolParams[i].StartFile, bsr->VolParams[i].EndFile); - bsendmsg(ua, "VolBlock=%u-%u\n", bsr->VolParams[i].StartBlock, + ua->send_msg("VolBlock=%u-%u\n", bsr->VolParams[i].StartBlock, bsr->VolParams[i].EndBlock); print_findex(ua, bsr->fi); }