X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fdird%2Fverify.c;h=d288aa237701670fa963631046a72237bc3d8fee;hb=c438cb6468cdfb7fc7288722295832eaaab8745a;hp=45b0246a5856f54b2fc9a35f765bac26fdf9eba2;hpb=fc92af306f2cd876b24b4858a15d05b18f525b6e;p=bacula%2Fbacula diff --git a/bacula/src/dird/verify.c b/bacula/src/dird/verify.c index 45b0246a58..d288aa2377 100644 --- a/bacula/src/dird/verify.c +++ b/bacula/src/dird/verify.c @@ -1,3 +1,30 @@ +/* + 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 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 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 -- verify.c -- responsible for running file verification @@ -11,21 +38,6 @@ * When the File daemon sends the attributes, compare them to * what is in the DB. * - * Version $Id$ - */ -/* - Copyright (C) 2000-2006 Kern Sibbald - - 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. - - 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. - */ @@ -33,17 +45,16 @@ #include "dird.h" #include "findlib/find.h" -/* Imported Global Variables */ -extern int debug_level; - /* Commands sent to File daemon */ -static char verifycmd[] = "verify level=%s\n"; -static char storaddr[] = "storage address=%s port=%d ssl=0\n"; +static char verifycmd[] = "verify level=%s\n"; +static char storaddr[] = "storage address=%s port=%d ssl=0 Authorization=%s\n"; /* Responses received from File daemon */ -static char OKverify[] = "2000 OK verify\n"; -static char OKstore[] = "2000 OK storage\n"; -static char OKbootstrap[] = "2000 OK bootstrap\n"; +static char OKverify[] = "2000 OK verify\n"; +static char OKstore[] = "2000 OK storage\n"; + +/* Responses received from the Storage daemon */ +static char OKbootstrap[] = "3000 OK bootstrap\n"; /* Forward referenced functions */ static void prt_fname(JCR *jcr); @@ -56,34 +67,76 @@ static int missing_handler(void *ctx, int num_fields, char **row); */ bool do_verify_init(JCR *jcr) { + if (!allow_duplicate_job(jcr)) { + return false; + } + switch (jcr->getJobLevel()) { + case L_VERIFY_INIT: + case L_VERIFY_CATALOG: + case L_VERIFY_DISK_TO_CATALOG: + free_rstorage(jcr); + free_wstorage(jcr); + break; + case L_VERIFY_VOLUME_TO_CATALOG: + free_wstorage(jcr); + break; + case L_VERIFY_DATA: + break; + default: + Jmsg2(jcr, M_FATAL, 0, _("Unimplemented Verify level %d(%c)\n"), jcr->getJobLevel(), + jcr->getJobLevel()); + return false; + } + return true; +} + + +/* + * Do a verification of the specified files against the Catlaog + * + * Returns: false on failure + * true on success + */ +bool do_verify(JCR *jcr) +{ + const char *level; + BSOCK *fd; + int stat; + char ed1[100]; JOB_DBR jr; JobId_t verify_jobid = 0; const char *Name; - memset(&jcr->target_jr, 0, sizeof(jcr->target_jr)); + free_wstorage(jcr); /* we don't write */ - Dmsg1(9, "bdird: created client %s record\n", jcr->client->hdr.name); + memset(&jcr->previous_jr, 0, sizeof(jcr->previous_jr)); /* - * Find JobId of last job that ran. E.g. - * for VERIFY_CATALOG we want the JobId of the last INIT. - * for VERIFY_VOLUME_TO_CATALOG, we want the JobId of the + * Find JobId of last job that ran. Note, we do this when + * the job actually starts running, not at schedule time, + * so that we find the last job that terminated before + * this job runs rather than before it is scheduled. This + * permits scheduling a Backup and Verify at the same time, + * but with the Verify at a lower priority. + * + * For VERIFY_CATALOG we want the JobId of the last INIT. + * For VERIFY_VOLUME_TO_CATALOG, we want the JobId of the * last backup Job. */ - if (jcr->JobLevel == L_VERIFY_CATALOG || - jcr->JobLevel == L_VERIFY_VOLUME_TO_CATALOG || - jcr->JobLevel == L_VERIFY_DISK_TO_CATALOG) { + if (jcr->getJobLevel() == L_VERIFY_CATALOG || + jcr->getJobLevel() == L_VERIFY_VOLUME_TO_CATALOG || + jcr->getJobLevel() == L_VERIFY_DISK_TO_CATALOG) { memcpy(&jr, &jcr->jr, sizeof(jr)); if (jcr->verify_job && - (jcr->JobLevel == L_VERIFY_VOLUME_TO_CATALOG || - jcr->JobLevel == L_VERIFY_DISK_TO_CATALOG)) { - Name = jcr->verify_job->hdr.name; + (jcr->getJobLevel() == L_VERIFY_VOLUME_TO_CATALOG || + jcr->getJobLevel() == L_VERIFY_DISK_TO_CATALOG)) { + Name = jcr->verify_job->name(); } else { Name = NULL; } Dmsg1(100, "find last jobid for: %s\n", NPRT(Name)); if (!db_find_last_jobid(jcr, jcr->db, Name, &jr)) { - if (jcr->JobLevel == L_VERIFY_CATALOG) { + if (jcr->getJobLevel() == L_VERIFY_CATALOG) { Jmsg(jcr, M_FATAL, 0, _( "Unable to find JobId of previous InitCatalog Job.\n" "Please run a Verify with Level=InitCatalog before\n" @@ -101,22 +154,23 @@ bool do_verify_init(JCR *jcr) * Now get the job record for the previous backup that interests * us. We use the verify_jobid that we found above. */ - if (jcr->JobLevel == L_VERIFY_CATALOG || - jcr->JobLevel == L_VERIFY_VOLUME_TO_CATALOG || - jcr->JobLevel == L_VERIFY_DISK_TO_CATALOG) { - jcr->target_jr.JobId = verify_jobid; - if (!db_get_job_record(jcr, jcr->db, &jcr->target_jr)) { + if (jcr->getJobLevel() == L_VERIFY_CATALOG || + jcr->getJobLevel() == L_VERIFY_VOLUME_TO_CATALOG || + jcr->getJobLevel() == L_VERIFY_DISK_TO_CATALOG) { + jcr->previous_jr.JobId = verify_jobid; + if (!db_get_job_record(jcr, jcr->db, &jcr->previous_jr)) { Jmsg(jcr, M_FATAL, 0, _("Could not get job record for previous Job. ERR=%s"), db_strerror(jcr->db)); return false; } - if (jcr->target_jr.JobStatus != 'T') { + if (!(jcr->previous_jr.JobStatus == JS_Terminated || + jcr->previous_jr.JobStatus == JS_Warnings)) { Jmsg(jcr, M_FATAL, 0, _("Last Job %d did not terminate normally. JobStatus=%c\n"), - verify_jobid, jcr->target_jr.JobStatus); + verify_jobid, jcr->previous_jr.JobStatus); return false; } Jmsg(jcr, M_INFO, 0, _("Verifying against JobId=%d Job=%s\n"), - jcr->target_jr.JobId, jcr->target_jr.Job); + jcr->previous_jr.JobId, jcr->previous_jr.Job); } /* @@ -125,34 +179,28 @@ bool do_verify_init(JCR *jcr) * create a dummy authorization key (passed to * File daemon but not used). */ - if (jcr->JobLevel == L_VERIFY_VOLUME_TO_CATALOG) { - if (!create_restore_bootstrap_file(jcr)) { + if (jcr->getJobLevel() == L_VERIFY_VOLUME_TO_CATALOG) { + int stat; + /* + * Note: negative status is an error, zero status, means + * no files were backed up, so skip calling SD and + * client. + */ + stat = create_restore_bootstrap_file(jcr); + if (stat < 0) { /* error */ return false; + } else if (stat == 0) { /* No files, nothing to do */ + verify_cleanup(jcr, JS_Terminated); /* clean up */ + return true; /* get out */ } } else { jcr->sd_auth_key = bstrdup("dummy"); /* dummy Storage daemon key */ } - if (jcr->JobLevel == L_VERIFY_DISK_TO_CATALOG && jcr->verify_job) { + if (jcr->getJobLevel() == L_VERIFY_DISK_TO_CATALOG && jcr->verify_job) { jcr->fileset = jcr->verify_job->fileset; } - Dmsg2(100, "ClientId=%u JobLevel=%c\n", jcr->target_jr.ClientId, jcr->JobLevel); - return true; -} - - -/* - * Do a verification of the specified files against the Catlaog - * - * Returns: false on failure - * true on success - */ -bool do_verify(JCR *jcr) -{ - const char *level; - BSOCK *fd; - int stat; - char ed1[100]; + Dmsg2(100, "ClientId=%u JobLevel=%c\n", jcr->previous_jr.ClientId, jcr->getJobLevel()); if (!db_update_job_start_record(jcr, jcr->db, &jcr->jr)) { Jmsg(jcr, M_FATAL, 0, "%s", db_strerror(jcr->db)); @@ -161,9 +209,10 @@ bool do_verify(JCR *jcr) /* Print Job Start message */ Jmsg(jcr, M_INFO, 0, _("Start Verify JobId=%s Level=%s Job=%s\n"), - edit_uint64(jcr->JobId, ed1), level_to_str(jcr->JobLevel), jcr->Job); + edit_uint64(jcr->JobId, ed1), level_to_str(jcr->getJobLevel()), jcr->Job); - if (jcr->JobLevel == L_VERIFY_VOLUME_TO_CATALOG) { + if (jcr->getJobLevel() == L_VERIFY_VOLUME_TO_CATALOG) { + BSOCK *sd; /* * Start conversation with Storage daemon */ @@ -174,7 +223,18 @@ bool do_verify(JCR *jcr) /* * Now start a job with the Storage daemon */ - if (!start_storage_daemon_job(jcr, jcr->storage, NULL)) { + if (!start_storage_daemon_job(jcr, jcr->rstorage, NULL)) { + return false; + } + sd = jcr->store_bsock; + /* + * Send the bootstrap file -- what Volumes/files to restore + */ + if (!send_bootstrap_file(jcr, sd) || + !response(jcr, sd, OKbootstrap, "Bootstrap", DISPLAY_ERROR)) { + goto bail_out; + } + if (!sd->fsend("run")) { return false; } /* @@ -185,9 +245,6 @@ bool do_verify(JCR *jcr) } Dmsg0(50, "Storage daemon connection OK\n"); - if (!bnet_fsend(jcr->store_bsock, "run")) { - return false; - } } /* * OK, now connect to the File daemon @@ -195,7 +252,7 @@ bool do_verify(JCR *jcr) */ set_jcr_job_status(jcr, JS_Blocked); if (!connect_to_file_daemon(jcr, 10, FDConnectTimeout, 1)) { - return false; + goto bail_out; } set_jcr_job_status(jcr, JS_Running); @@ -204,19 +261,19 @@ bool do_verify(JCR *jcr) Dmsg0(30, ">filed: Send include list\n"); if (!send_include_list(jcr)) { - return false; + goto bail_out; } Dmsg0(30, ">filed: Send exclude list\n"); if (!send_exclude_list(jcr)) { - return false; + goto bail_out; } /* * Send Level command to File daemon, as well * as the Storage address if appropriate. */ - switch (jcr->JobLevel) { + switch (jcr->getJobLevel()) { case L_VERIFY_INIT: level = "init"; break; @@ -227,25 +284,18 @@ bool do_verify(JCR *jcr) /* * send Storage daemon address to the File daemon */ - if (jcr->store->SDDport == 0) { - jcr->store->SDDport = jcr->store->SDport; + if (jcr->rstore->SDDport == 0) { + jcr->rstore->SDDport = jcr->rstore->SDport; } - bnet_fsend(fd, storaddr, jcr->store->address, jcr->store->SDDport); + bnet_fsend(fd, storaddr, jcr->rstore->address, + jcr->rstore->SDDport, jcr->sd_auth_key); if (!response(jcr, fd, OKstore, "Storage", DISPLAY_ERROR)) { - return false; - } - - /* - * Send the bootstrap file -- what Volumes/files to restore - */ - if (!send_bootstrap_file(jcr, fd) || - !response(jcr, fd, OKbootstrap, "Bootstrap", DISPLAY_ERROR)) { - return false; + goto bail_out; } if (!jcr->RestoreBootstrap) { Jmsg0(jcr, M_FATAL, 0, _("Deprecated feature ... use bootstrap.\n")); - return false; + goto bail_out; } level = "volume"; @@ -257,21 +307,21 @@ bool do_verify(JCR *jcr) level="disk_to_catalog"; break; default: - Jmsg2(jcr, M_FATAL, 0, _("Unimplemented Verify level %d(%c)\n"), jcr->JobLevel, - jcr->JobLevel); - return false; + Jmsg2(jcr, M_FATAL, 0, _("Unimplemented Verify level %d(%c)\n"), jcr->getJobLevel(), + jcr->getJobLevel()); + goto bail_out; } - if (!send_run_before_and_after_commands(jcr)) { - return false; + if (!send_runscripts_commands(jcr)) { + goto bail_out; } /* * Send verify command/level to File daemon */ - bnet_fsend(fd, verifycmd, level); + fd->fsend(verifycmd, level); if (!response(jcr, fd, OKverify, "Verify", DISPLAY_ERROR)) { - return false; + goto bail_out; } /* @@ -280,24 +330,24 @@ bool do_verify(JCR *jcr) * catalog depending on the run type. */ /* Compare to catalog */ - switch (jcr->JobLevel) { + switch (jcr->getJobLevel()) { case L_VERIFY_CATALOG: Dmsg0(10, "Verify level=catalog\n"); jcr->sd_msg_thread_done = true; /* no SD msg thread, so it is done */ jcr->SDJobStatus = JS_Terminated; - get_attributes_and_compare_to_catalog(jcr, jcr->target_jr.JobId); + get_attributes_and_compare_to_catalog(jcr, jcr->previous_jr.JobId); break; case L_VERIFY_VOLUME_TO_CATALOG: Dmsg0(10, "Verify level=volume\n"); - get_attributes_and_compare_to_catalog(jcr, jcr->target_jr.JobId); + get_attributes_and_compare_to_catalog(jcr, jcr->previous_jr.JobId); break; case L_VERIFY_DISK_TO_CATALOG: Dmsg0(10, "Verify level=disk_to_catalog\n"); jcr->sd_msg_thread_done = true; /* no SD msg thread, so it is done */ jcr->SDJobStatus = JS_Terminated; - get_attributes_and_compare_to_catalog(jcr, jcr->target_jr.JobId); + get_attributes_and_compare_to_catalog(jcr, jcr->previous_jr.JobId); break; case L_VERIFY_INIT: @@ -306,18 +356,20 @@ bool do_verify(JCR *jcr) jcr->sd_msg_thread_done = true; /* no SD msg thread, so it is done */ jcr->SDJobStatus = JS_Terminated; get_attributes_and_put_in_catalog(jcr); + db_end_transaction(jcr, jcr->db); /* terminate any open transaction */ + db_write_batch_file_records(jcr); break; default: - Jmsg1(jcr, M_FATAL, 0, _("Unimplemented verify level %d\n"), jcr->JobLevel); - return false; + Jmsg1(jcr, M_FATAL, 0, _("Unimplemented verify level %d\n"), jcr->getJobLevel()); + goto bail_out; } stat = wait_for_job_termination(jcr); - if (stat == JS_Terminated) { - verify_cleanup(jcr, stat); - return true; - } + verify_cleanup(jcr, stat); + return true; + +bail_out: return false; } @@ -337,25 +389,22 @@ void verify_cleanup(JCR *jcr, int TermCode) const char *Name; // Dmsg1(100, "Enter verify_cleanup() TermCod=%d\n", TermCode); - dequeue_messages(jcr); /* display any queued messages */ - Dmsg3(900, "JobLevel=%c Expected=%u JobFiles=%u\n", jcr->JobLevel, + Dmsg3(900, "JobLevel=%c Expected=%u JobFiles=%u\n", jcr->getJobLevel(), jcr->ExpectedFiles, jcr->JobFiles); - if (jcr->JobLevel == L_VERIFY_VOLUME_TO_CATALOG && + if (jcr->getJobLevel() == L_VERIFY_VOLUME_TO_CATALOG && jcr->ExpectedFiles != jcr->JobFiles) { TermCode = JS_ErrorTerminated; } - /* If no files were expected, there can be no error */ - if (jcr->JobLevel == L_VERIFY_VOLUME_TO_CATALOG && - jcr->ExpectedFiles == 0) { - TermCode = JS_Terminated; - } - JobId = jcr->jr.JobId; - set_jcr_job_status(jcr, TermCode); - update_job_end_record(jcr); + update_job_end(jcr, TermCode); + + if (job_canceled(jcr)) { + cancel_storage_daemon_job(jcr); + } + if (jcr->unlink_bsr && jcr->RestoreBootstrap) { unlink(jcr->RestoreBootstrap); jcr->unlink_bsr = false; @@ -395,9 +444,10 @@ void verify_cleanup(JCR *jcr, int TermCode) } jobstatus_to_ascii(jcr->FDJobStatus, fd_term_msg, sizeof(fd_term_msg)); - if (jcr->JobLevel == L_VERIFY_VOLUME_TO_CATALOG) { + if (jcr->getJobLevel() == L_VERIFY_VOLUME_TO_CATALOG) { jobstatus_to_ascii(jcr->SDJobStatus, sd_term_msg, sizeof(sd_term_msg)); - Jmsg(jcr, msg_type, 0, _("Bacula %s (%s): %s\n" + Jmsg(jcr, msg_type, 0, _("%s %s %s (%s): %s\n" +" Build OS: %s %s %s\n" " JobId: %d\n" " Job: %s\n" " FileSet: %s\n" @@ -413,26 +463,26 @@ void verify_cleanup(JCR *jcr, int TermCode) " FD termination status: %s\n" " SD termination status: %s\n" " Termination: %s\n\n"), - VERSION, - LSMDATE, - edt, - jcr->jr.JobId, - jcr->jr.Job, - jcr->fileset->hdr.name, - level_to_str(jcr->JobLevel), - jcr->client->hdr.name, - jcr->target_jr.JobId, - Name, - sdt, - edt, - edit_uint64_with_commas(jcr->ExpectedFiles, ec1), - edit_uint64_with_commas(jcr->JobFiles, ec2), - jcr->Errors, - fd_term_msg, - sd_term_msg, - term_msg); + BACULA, my_name, VERSION, LSMDATE, edt, + HOST_OS, DISTNAME, DISTVER, + jcr->jr.JobId, + jcr->jr.Job, + jcr->fileset->hdr.name, + level_to_str(jcr->getJobLevel()), + jcr->client->hdr.name, + jcr->previous_jr.JobId, + Name, + sdt, + edt, + edit_uint64_with_commas(jcr->ExpectedFiles, ec1), + edit_uint64_with_commas(jcr->JobFiles, ec2), + jcr->JobErrors, + fd_term_msg, + sd_term_msg, + term_msg); } else { - Jmsg(jcr, msg_type, 0, _("Bacula %s (%s): %s\n" + Jmsg(jcr, msg_type, 0, _("%s %s %s (%s): %s\n" +" Build: %s %s %s\n" " JobId: %d\n" " Job: %s\n" " FileSet: %s\n" @@ -446,22 +496,21 @@ void verify_cleanup(JCR *jcr, int TermCode) " Non-fatal FD errors: %d\n" " FD termination status: %s\n" " Termination: %s\n\n"), - VERSION, - LSMDATE, - edt, - jcr->jr.JobId, - jcr->jr.Job, - jcr->fileset->hdr.name, - level_to_str(jcr->JobLevel), - jcr->client->hdr.name, - jcr->target_jr.JobId, - Name, - sdt, - edt, - edit_uint64_with_commas(jcr->JobFiles, ec1), - jcr->Errors, - fd_term_msg, - term_msg); + BACULA, my_name, VERSION, LSMDATE, edt, + HOST_OS, DISTNAME, DISTVER, + jcr->jr.JobId, + jcr->jr.Job, + jcr->fileset->hdr.name, + level_to_str(jcr->getJobLevel()), + jcr->client->name(), + jcr->previous_jr.JobId, + Name, + sdt, + edt, + edit_uint64_with_commas(jcr->JobFiles, ec1), + jcr->JobErrors, + fd_term_msg, + term_msg); } Dmsg0(100, "Leave verify_cleanup()\n"); } @@ -469,14 +518,13 @@ void verify_cleanup(JCR *jcr, int TermCode) /* * This routine is called only during a Verify */ -int get_attributes_and_compare_to_catalog(JCR *jcr, JobId_t JobId) +void get_attributes_and_compare_to_catalog(JCR *jcr, JobId_t JobId) { BSOCK *fd; int n, len; FILE_DBR fdbr; struct stat statf; /* file stat */ struct stat statc; /* catalog stat */ - int stat = JS_Terminated; char buf[MAXSTRING]; POOLMEM *fname = get_pool_memory(PM_MESSAGE); int do_Digest = CRYPTO_DIGEST_NONE; @@ -503,6 +551,9 @@ int get_attributes_and_compare_to_catalog(JCR *jcr, JobId_t JobId) char *attr, *p, *fn; char Opts_Digest[MAXSTRING]; /* Verify Opts or MD5/SHA1 digest */ + if (job_canceled(jcr)) { + return; + } fname = check_pool_memory_size(fname, fd->msglen); jcr->fname = check_pool_memory_size(jcr->fname, fd->msglen); Dmsg1(200, "Atts+Digest=%s\n", fd->msg); @@ -510,7 +561,7 @@ int get_attributes_and_compare_to_catalog(JCR *jcr, JobId_t JobId) fname)) != 3) { Jmsg3(jcr, M_FATAL, 0, _("birdmsglen, fd->msg); - return false; + return; } /* * We read the Options or Signature into fname @@ -538,6 +589,7 @@ int get_attributes_and_compare_to_catalog(JCR *jcr, JobId_t JobId) Dmsg2(400, "file_index=%d attr=%s\n", file_index, attr); jcr->JobFiles++; jcr->FileIndex = file_index; /* remember attribute file_index */ + jcr->previous_jr.FileIndex = file_index; decode_stat(attr, &statf, &LinkFIf); /* decode file stat packet */ do_Digest = CRYPTO_DIGEST_NONE; jcr->fn_printed = false; @@ -551,10 +603,10 @@ int get_attributes_and_compare_to_catalog(JCR *jcr, JobId_t JobId) */ fdbr.FileId = 0; if (!db_get_file_attributes_record(jcr, jcr->db, jcr->fname, - &jcr->target_jr, &fdbr)) { + &jcr->previous_jr, &fdbr)) { Jmsg(jcr, M_INFO, 0, _("New file: %s\n"), jcr->fname); Dmsg1(020, _("File not in catalog: %s\n"), jcr->fname); - stat = JS_Differences; + set_jcr_job_status(jcr, JS_Differences); continue; } else { /* @@ -580,7 +632,7 @@ int get_attributes_and_compare_to_catalog(JCR *jcr, JobId_t JobId) Jmsg(jcr, M_INFO, 0, _(" st_ino differ. Cat: %s File: %s\n"), edit_uint64((uint64_t)statc.st_ino, ed1), edit_uint64((uint64_t)statf.st_ino, ed2)); - stat = JS_Differences; + set_jcr_job_status(jcr, JS_Differences); } break; case 'p': /* permissions bits */ @@ -588,7 +640,7 @@ int get_attributes_and_compare_to_catalog(JCR *jcr, JobId_t JobId) prt_fname(jcr); Jmsg(jcr, M_INFO, 0, _(" st_mode differ. Cat: %x File: %x\n"), (uint32_t)statc.st_mode, (uint32_t)statf.st_mode); - stat = JS_Differences; + set_jcr_job_status(jcr, JS_Differences); } break; case 'n': /* number of links */ @@ -596,7 +648,7 @@ int get_attributes_and_compare_to_catalog(JCR *jcr, JobId_t JobId) prt_fname(jcr); Jmsg(jcr, M_INFO, 0, _(" st_nlink differ. Cat: %d File: %d\n"), (uint32_t)statc.st_nlink, (uint32_t)statf.st_nlink); - stat = JS_Differences; + set_jcr_job_status(jcr, JS_Differences); } break; case 'u': /* user id */ @@ -604,7 +656,7 @@ int get_attributes_and_compare_to_catalog(JCR *jcr, JobId_t JobId) prt_fname(jcr); Jmsg(jcr, M_INFO, 0, _(" st_uid differ. Cat: %u File: %u\n"), (uint32_t)statc.st_uid, (uint32_t)statf.st_uid); - stat = JS_Differences; + set_jcr_job_status(jcr, JS_Differences); } break; case 'g': /* group id */ @@ -612,7 +664,7 @@ int get_attributes_and_compare_to_catalog(JCR *jcr, JobId_t JobId) prt_fname(jcr); Jmsg(jcr, M_INFO, 0, _(" st_gid differ. Cat: %u File: %u\n"), (uint32_t)statc.st_gid, (uint32_t)statf.st_gid); - stat = JS_Differences; + set_jcr_job_status(jcr, JS_Differences); } break; case 's': /* size */ @@ -621,28 +673,28 @@ int get_attributes_and_compare_to_catalog(JCR *jcr, JobId_t JobId) Jmsg(jcr, M_INFO, 0, _(" st_size differ. Cat: %s File: %s\n"), edit_uint64((uint64_t)statc.st_size, ed1), edit_uint64((uint64_t)statf.st_size, ed2)); - stat = JS_Differences; + set_jcr_job_status(jcr, JS_Differences); } break; case 'a': /* access time */ if (statc.st_atime != statf.st_atime) { prt_fname(jcr); Jmsg(jcr, M_INFO, 0, _(" st_atime differs\n")); - stat = JS_Differences; + set_jcr_job_status(jcr, JS_Differences); } break; case 'm': if (statc.st_mtime != statf.st_mtime) { prt_fname(jcr); Jmsg(jcr, M_INFO, 0, _(" st_mtime differs\n")); - stat = JS_Differences; + set_jcr_job_status(jcr, JS_Differences); } break; case 'c': /* ctime */ if (statc.st_ctime != statf.st_ctime) { prt_fname(jcr); Jmsg(jcr, M_INFO, 0, _(" st_ctime differs\n")); - stat = JS_Differences; + set_jcr_job_status(jcr, JS_Differences); } break; case 'd': /* file size decrease */ @@ -651,7 +703,7 @@ int get_attributes_and_compare_to_catalog(JCR *jcr, JobId_t JobId) Jmsg(jcr, M_INFO, 0, _(" st_size decrease. Cat: %s File: %s\n"), edit_uint64((uint64_t)statc.st_size, ed1), edit_uint64((uint64_t)statf.st_size, ed2)); - stat = JS_Differences; + set_jcr_job_status(jcr, JS_Differences); } break; case '5': /* compare MD5 */ @@ -674,26 +726,21 @@ int get_attributes_and_compare_to_catalog(JCR *jcr, JobId_t JobId) } else if (crypto_digest_stream_type(stream) != CRYPTO_DIGEST_NONE) { Dmsg2(400, "stream=Digest inx=%d Digest=%s\n", file_index, Opts_Digest); /* - * When ever we get a digest is MUST have been + * When ever we get a digest it MUST have been * preceded by an attributes record, which sets attr_file_index */ if (jcr->FileIndex != (uint32_t)file_index) { Jmsg2(jcr, M_FATAL, 0, _("MD5/SHA1 index %d not same as attributes %d\n"), file_index, jcr->FileIndex); - return false; + return; } if (do_Digest != CRYPTO_DIGEST_NONE) { - db_escape_string(buf, Opts_Digest, strlen(Opts_Digest)); + db_escape_string(jcr, jcr->db, buf, Opts_Digest, strlen(Opts_Digest)); if (strcmp(buf, fdbr.Digest) != 0) { prt_fname(jcr); - if (debug_level >= 10) { - Jmsg(jcr, M_INFO, 0, _(" %s not same. File=%s Cat=%s\n"), - stream_to_ascii(stream), buf, fdbr.Digest); - } else { - Jmsg(jcr, M_INFO, 0, _(" %s differs.\n"), - stream_to_ascii(stream)); - } - stat = JS_Differences; + Jmsg(jcr, M_INFO, 0, _(" %s differs. File=%s Cat=%s\n"), + stream_to_ascii(stream), buf, fdbr.Digest); + set_jcr_job_status(jcr, JS_Differences); } do_Digest = CRYPTO_DIGEST_NONE; } @@ -703,28 +750,26 @@ int get_attributes_and_compare_to_catalog(JCR *jcr, JobId_t JobId) if (is_bnet_error(fd)) { berrno be; Jmsg2(jcr, M_FATAL, 0, _("bdirdfn_printed = false; bsnprintf(buf, sizeof(buf), -"SELECT Path.Path,Filename.Name FROM File,Path,Filename " -"WHERE File.JobId=%d " -"AND File.MarkedId!=%d AND File.PathId=Path.PathId " -"AND File.FilenameId=Filename.FilenameId", - JobId, jcr->JobId); + "SELECT Path.Path,Filename.Name FROM File,Path,Filename " + "WHERE File.JobId=%d AND File.FileIndex > 0 " + "AND File.MarkId!=%d AND File.PathId=Path.PathId " + "AND File.FilenameId=Filename.FilenameId", + JobId, jcr->JobId); /* missing_handler is called for each file found */ db_sql_query(jcr->db, buf, missing_handler, (void *)jcr); if (jcr->fn_printed) { - stat = JS_Differences; + set_jcr_job_status(jcr, JS_Differences); } free_pool_memory(fname); - set_jcr_job_status(jcr, stat); - return stat == JS_Terminated; } /* @@ -737,12 +782,15 @@ static int missing_handler(void *ctx, int num_fields, char **row) { JCR *jcr = (JCR *)ctx; + if (job_canceled(jcr)) { + return 1; + } if (!jcr->fn_printed) { - Jmsg(jcr, M_INFO, 0, "\n"); - Jmsg(jcr, M_INFO, 0, _("The following files are missing:\n")); + Qmsg(jcr, M_WARNING, 0, _("The following files are in the Catalog but not on %s:\n"), + jcr->getJobLevel() == L_VERIFY_VOLUME_TO_CATALOG ? "the Volume(s)" : "disk"); jcr->fn_printed = true; } - Jmsg(jcr, M_INFO, 0, " %s%s\n", row[0]?row[0]:"", row[1]?row[1]:""); + Qmsg(jcr, M_INFO, 0, " %s%s\n", row[0]?row[0]:"", row[1]?row[1]:""); return 0; } @@ -754,6 +802,6 @@ static void prt_fname(JCR *jcr) { if (!jcr->fn_printed) { Jmsg(jcr, M_INFO, 0, _("File: %s\n"), jcr->fname); - jcr->fn_printed = TRUE; + jcr->fn_printed = true; } }