*
* Kern Sibbald, October MM
*
- * This routine is run as a separate thread. There may be more
- * work to be done to make it totally reentrant!!!!
- *
- * Current implementation is Catalog verification only (i.e. no
- * verification versus tape).
- *
* Basic tasks done here:
* Open DB
* Open connection with File daemon and pass him commands
- * to do the verify.
+ * to do the verify.
* When the File daemon sends the attributes, compare them to
- * what is in the DB.
+ * what is in 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 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 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.
*/
+
#include "bacula.h"
#include "dird.h"
+#include "findlib/find.h"
/* Imported Global Variables */
extern int debug_level;
/* Commands sent to File daemon */
-static char verifycmd[] = "verify";
-static char levelcmd[] = "level = %s%s\n";
+static char verifycmd[] = "verify level=%s\n";
+static char storaddr[] = "storage address=%s port=%d ssl=0\n";
/* Responses received from File daemon */
-static char OKverify[] = "2000 OK verify\n";
-static char OKlevel[] = "2000 OK level\n";
+static char OKverify[] = "2000 OK verify\n";
+static char OKstore[] = "2000 OK storage\n";
/* Forward referenced functions */
-static void verify_cleanup(JCR *jcr);
static void prt_fname(JCR *jcr);
static int missing_handler(void *ctx, int num_fields, char **row);
+
/*
- * Do a verification of the specified files
- *
- * Returns: 0 on failure
- * 1 on success
+ * Called here before the job is run to do the job
+ * specific setup.
*/
-int do_verify(JCR *jcr)
+bool do_verify_init(JCR *jcr)
{
- char *level;
- BSOCK *fd;
JOB_DBR jr;
- int last_full_id;
- CLIENT_DBR cr;
+ JobId_t verify_jobid = 0;
+ const char *Name;
- memset(&cr, 0, sizeof(cr));
- strcpy(cr.Name, jcr->client->hdr.name);
- 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));
- jcr->JobStatus = JS_ErrorTerminated;
- verify_cleanup(jcr);
- return 0;
- }
- jcr->jr.ClientId = cr.ClientId;
+ memset(&jcr->target_jr, 0, sizeof(jcr->target_jr));
Dmsg1(9, "bdird: created client %s record\n", jcr->client->hdr.name);
- /* If we are doing a verify from the catalog,
- * we must look up the time and date of the
- * last full verify.
+ /*
+ * 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
+ * last backup Job.
+ */
+ if (jcr->JobLevel == L_VERIFY_CATALOG ||
+ jcr->JobLevel == L_VERIFY_VOLUME_TO_CATALOG ||
+ jcr->JobLevel == 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;
+ } 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) {
+ Jmsg(jcr, M_FATAL, 0, _(
+ "Unable to find JobId of previous InitCatalog Job.\n"
+ "Please run a Verify with Level=InitCatalog before\n"
+ "running the current Job.\n"));
+ } else {
+ Jmsg(jcr, M_FATAL, 0, _(
+ "Unable to find JobId of previous Job for this client.\n"));
+ }
+ return false;
+ }
+ verify_jobid = jr.JobId;
+ Dmsg1(100, "Last full jobid=%d\n", verify_jobid);
+ }
+ /*
+ * Now get the job record for the previous backup that interests
+ * us. We use the verify_jobid that we found above.
*/
- if (jcr->level == L_VERIFY_CATALOG) {
- memcpy(&jr, &(jcr->jr), sizeof(jr));
- if (!db_find_last_full_verify(jcr->db, &jr)) {
- Jmsg(jcr, M_FATAL, 0, _("Unable to find last full verify. %s"),
- db_strerror(jcr->db));
- jcr->JobStatus = JS_ErrorTerminated;
- verify_cleanup(jcr);
- return 0;
+ 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)) {
+ 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') {
+ Jmsg(jcr, M_FATAL, 0, _("Last Job %d did not terminate normally. JobStatus=%c\n"),
+ verify_jobid, jcr->target_jr.JobStatus);
+ return false;
}
- last_full_id = jr.JobId;
- Dmsg1(20, "Last full id=%d\n", last_full_id);
+ Jmsg(jcr, M_INFO, 0, _("Verifying against JobId=%d Job=%s\n"),
+ jcr->target_jr.JobId, jcr->target_jr.Job);
}
- jcr->jr.JobId = jcr->JobId;
- jcr->jr.StartTime = jcr->start_time;
- jcr->jr.Level = jcr->level;
- if (!db_update_job_start_record(jcr->db, &jcr->jr)) {
- Jmsg(jcr, M_ERROR, 0, "%s", db_strerror(jcr->db));
- jcr->JobStatus = JS_ErrorTerminated;
- verify_cleanup(jcr);
- return 0;
+ /*
+ * If we are verifying a Volume, we need the Storage
+ * daemon, so open a connection, otherwise, just
+ * create a dummy authorization key (passed to
+ * File daemon but not used).
+ */
+ if (jcr->JobLevel == L_VERIFY_VOLUME_TO_CATALOG) {
+ RESTORE_CTX rx;
+ UAContext *ua;
+ memset(&rx, 0, sizeof(rx));
+ rx.bsr = new_bsr();
+ rx.JobIds = "";
+ rx.bsr->JobId = jcr->target_jr.JobId;
+ ua = new_ua_context(jcr);
+ complete_bsr(ua, rx.bsr);
+ rx.bsr->fi = new_findex();
+ rx.bsr->fi->findex = 1;
+ rx.bsr->fi->findex2 = jcr->target_jr.JobFiles;
+ jcr->ExpectedFiles = write_bsr_file(ua, rx);
+ if (jcr->ExpectedFiles == 0) {
+ free_ua_context(ua);
+ free_bsr(rx.bsr);
+ return false;
+ }
+ if (jcr->RestoreBootstrap) {
+ free(jcr->RestoreBootstrap);
+ }
+ POOLMEM *fname = get_pool_memory(PM_MESSAGE);
+ make_unique_restore_filename(ua, &fname);
+ jcr->RestoreBootstrap = bstrdup(fname);
+ free_ua_context(ua);
+ free_bsr(rx.bsr);
+ free_pool_memory(fname);
+ jcr->needs_sd = true;
+
+ } else {
+ jcr->sd_auth_key = bstrdup("dummy"); /* dummy Storage daemon key */
}
- if (!jcr->fname) {
- jcr->fname = (char *) get_pool_memory(PM_FNAME);
+ if (jcr->JobLevel == 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];
- jcr->jr.JobId = last_full_id; /* save last full id */
+ if (!db_update_job_start_record(jcr, jcr->db, &jcr->jr)) {
+ Jmsg(jcr, M_FATAL, 0, "%s", db_strerror(jcr->db));
+ return false;
+ }
/* Print Job Start message */
- Jmsg(jcr, M_INFO, 0, _("Start Verify JobId %d Job=%s\n"),
- jcr->JobId, jcr->Job);
-
- if (jcr->level == L_VERIFY_CATALOG) {
- memset(&jr, 0, sizeof(jr));
- jr.JobId = last_full_id;
- if (!db_get_job_record(jcr->db, &jr)) {
- Jmsg(jcr, M_ERROR, 0, _("Could not get job record. %s"), db_strerror(jcr->db));
- jcr->JobStatus = JS_ErrorTerminated;
- verify_cleanup(jcr);
- return 0;
+ 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);
+
+ if (jcr->JobLevel == L_VERIFY_VOLUME_TO_CATALOG) {
+ /*
+ * Start conversation with Storage daemon
+ */
+ set_jcr_job_status(jcr, JS_Blocked);
+ if (!connect_to_storage_daemon(jcr, 10, SDConnectTimeout, 1)) {
+ return false;
+ }
+ /*
+ * Now start a job with the Storage daemon
+ */
+ if (!start_storage_daemon_job(jcr, jcr->storage, NULL)) {
+ return false;
+ }
+ /*
+ * Now start a Storage daemon message thread
+ */
+ if (!start_storage_daemon_message_thread(jcr)) {
+ return false;
}
- Jmsg(jcr, M_INFO, 0, _("Verifying against Init JobId %d run %s\n"),
- last_full_id, jr.cStartTime);
+ Dmsg0(50, "Storage daemon connection OK\n");
}
-
/*
* OK, now connect to the File daemon
* and ask him for the files.
*/
- jcr->sd_auth_key = bstrdup("dummy"); /* dummy Storage daemon key */
+ set_jcr_job_status(jcr, JS_Blocked);
if (!connect_to_file_daemon(jcr, 10, FDConnectTimeout, 1)) {
- jcr->JobStatus = JS_ErrorTerminated;
- verify_cleanup(jcr);
- return 0;
+ return false;
}
+ set_jcr_job_status(jcr, JS_Running);
fd = jcr->file_bsock;
+
Dmsg0(30, ">filed: Send include list\n");
if (!send_include_list(jcr)) {
- jcr->JobStatus = JS_ErrorTerminated;
- verify_cleanup(jcr);
- return 0;
+ return false;
}
Dmsg0(30, ">filed: Send exclude list\n");
if (!send_exclude_list(jcr)) {
- jcr->JobStatus = JS_ErrorTerminated;
- verify_cleanup(jcr);
- return 0;
+ return false;
}
- /*
- * Send Level command to File daemon
- *
+ /*
+ * Send Level command to File daemon, as well
+ * as the Storage address if appropriate.
*/
- switch (jcr->level) {
- case L_VERIFY_INIT:
- level = "init";
- break;
- case L_VERIFY_CATALOG:
- level = "catalog";
- break;
- case L_VERIFY_VOLUME:
- level = "volume";
- break;
- case L_VERIFY_DATA:
- level = "data";
- break;
- default:
- Emsg1(M_FATAL, 0, _("Unimplemented save level %d\n"), jcr->level);
- jcr->JobStatus = JS_ErrorTerminated;
- verify_cleanup(jcr);
- return 0;
+ switch (jcr->JobLevel) {
+ case L_VERIFY_INIT:
+ level = "init";
+ break;
+ case L_VERIFY_CATALOG:
+ level = "catalog";
+ break;
+ case L_VERIFY_VOLUME_TO_CATALOG:
+ /*
+ * send Storage daemon address to the File daemon
+ */
+ if (jcr->store->SDDport == 0) {
+ jcr->store->SDDport = jcr->store->SDport;
+ }
+ bnet_fsend(fd, storaddr, jcr->store->address, jcr->store->SDDport);
+ if (!response(jcr, fd, OKstore, "Storage", DISPLAY_ERROR)) {
+ return false;
+ }
+
+ /*
+ * Send the bootstrap file -- what Volumes/files to restore
+ */
+ if (!send_bootstrap_file(jcr)) {
+ return false;
+ }
+
+ if (!jcr->RestoreBootstrap) {
+ Jmsg0(jcr, M_FATAL, 0, _("Deprecated feature ... use bootstrap.\n"));
+ return false;
+ }
+
+ level = "volume";
+ break;
+ case L_VERIFY_DATA:
+ level = "data";
+ break;
+ case L_VERIFY_DISK_TO_CATALOG:
+ level="disk_to_catalog";
+ break;
+ default:
+ Jmsg2(jcr, M_FATAL, 0, _("Unimplemented Verify level %d(%c)\n"), jcr->JobLevel,
+ jcr->JobLevel);
+ return false;
}
- Dmsg1(20, ">filed: %s", fd->msg);
- bnet_fsend(fd, levelcmd, level, " ");
- if (!response(fd, OKlevel, "Level")) {
- jcr->JobStatus = JS_ErrorTerminated;
- verify_cleanup(jcr);
- return 0;
+
+ if (!send_run_before_and_after_commands(jcr)) {
+ return false;
}
- /*
- * Send verify command to File daemon
+ /*
+ * Send verify command/level to File daemon
*/
- bnet_fsend(fd, verifycmd);
- if (!response(fd, OKverify, "Verify")) {
- jcr->JobStatus = JS_ErrorTerminated;
- verify_cleanup(jcr);
- return 0;
+ bnet_fsend(fd, verifycmd, level);
+ if (!response(jcr, fd, OKverify, "Verify", DISPLAY_ERROR)) {
+ return false;
}
/*
* catalog depending on the run type.
*/
/* Compare to catalog */
- if (jcr->level == L_VERIFY_CATALOG) {
+ switch (jcr->JobLevel) {
+ case L_VERIFY_CATALOG:
Dmsg0(10, "Verify level=catalog\n");
- get_attributes_and_compare_to_catalog(jcr, last_full_id);
-
- /* Build catalog */
- } else if (jcr->level == L_VERIFY_INIT) {
+ 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);
+ break;
+
+ case L_VERIFY_VOLUME_TO_CATALOG:
+ Dmsg0(10, "Verify level=volume\n");
+ get_attributes_and_compare_to_catalog(jcr, jcr->target_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);
+ break;
+
+ case L_VERIFY_INIT:
+ /* Build catalog */
Dmsg0(10, "Verify level=init\n");
+ 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);
+ break;
- } else {
- Emsg1(M_FATAL, 0, _("Unimplemented save level %d\n"), jcr->level);
- jcr->JobStatus = JS_ErrorTerminated;
- verify_cleanup(jcr);
- return 0;
+ default:
+ Jmsg1(jcr, M_FATAL, 0, _("Unimplemented verify level %d\n"), jcr->JobLevel);
+ return false;
}
- verify_cleanup(jcr);
- return 1;
+ stat = wait_for_job_termination(jcr);
+ if (stat == JS_Terminated) {
+ verify_cleanup(jcr, stat);
+ return true;
+ }
+ return false;
}
+
/*
* Release resources allocated during backup.
*
*/
-static void verify_cleanup(JCR *jcr)
+void verify_cleanup(JCR *jcr, int TermCode)
{
char sdt[50], edt[50];
- char ec1[30];
- char term_code[100];
- char *term_msg;
+ char ec1[30], ec2[30];
+ char term_code[100], fd_term_msg[100], sd_term_msg[100];
+ const char *term_msg;
int msg_type;
- int TermCode;
- int last_full_id;
-
- Dmsg0(100, "Enter verify_cleanup()\n");
+ JobId_t JobId;
+ const char *Name;
- last_full_id = jcr->jr.JobId;
+// 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,
+ jcr->ExpectedFiles, jcr->JobFiles);
+ if (jcr->JobLevel == L_VERIFY_VOLUME_TO_CATALOG &&
+ jcr->ExpectedFiles != jcr->JobFiles) {
+ TermCode = JS_ErrorTerminated;
+ }
- if (jcr->jr.EndTime == 0) {
- jcr->jr.EndTime = time(NULL);
+ /* If no files were expected, there can be no error */
+ if (jcr->JobLevel == L_VERIFY_VOLUME_TO_CATALOG &&
+ jcr->ExpectedFiles == 0) {
+ TermCode = JS_Terminated;
}
- jcr->end_time = jcr->jr.EndTime;
- jcr->jr.JobId = jcr->JobId;
- jcr->jr.JobStatus = jcr->JobStatus;
- TermCode = jcr->JobStatus;
-
- if (!db_update_job_end_record(jcr->db, &jcr->jr)) {
- Jmsg(jcr, M_WARNING, 0, _("Error updating job record. %s"),
- db_strerror(jcr->db));
+
+ JobId = jcr->jr.JobId;
+ set_jcr_job_status(jcr, TermCode);
+
+ update_job_end_record(jcr);
+ if (jcr->unlink_bsr && jcr->RestoreBootstrap) {
+ unlink(jcr->RestoreBootstrap);
+ jcr->unlink_bsr = false;
}
- msg_type = M_INFO; /* by default INFO message */
+ msg_type = M_INFO; /* by default INFO message */
switch (TermCode) {
- case JS_Terminated:
- term_msg = _("Verify OK");
- break;
- case JS_Errored:
- term_msg = _("*** Verify Error ***");
- msg_type = M_ERROR; /* Generate error message */
- break;
- case JS_Cancelled:
- term_msg = _("Verify Cancelled");
- break;
- case JS_Differences:
- term_msg = _("Verify Differences");
- break;
- default:
- term_msg = term_code;
- sprintf(term_code, _("Inappropriate term code: %c\n"), TermCode);
- break;
+ case JS_Terminated:
+ term_msg = _("Verify OK");
+ break;
+ case JS_FatalError:
+ case JS_ErrorTerminated:
+ term_msg = _("*** Verify Error ***");
+ msg_type = M_ERROR; /* Generate error message */
+ break;
+ case JS_Error:
+ term_msg = _("Verify warnings");
+ break;
+ case JS_Canceled:
+ term_msg = _("Verify Canceled");
+ break;
+ case JS_Differences:
+ term_msg = _("Verify Differences");
+ break;
+ default:
+ term_msg = term_code;
+ bsnprintf(term_code, sizeof(term_code),
+ _("Inappropriate term code: %d %c\n"), TermCode, TermCode);
+ break;
+ }
+ bstrftimes(sdt, sizeof(sdt), jcr->jr.StartTime);
+ bstrftimes(edt, sizeof(edt), jcr->jr.EndTime);
+ if (jcr->verify_job) {
+ Name = jcr->verify_job->hdr.name;
+ } else {
+ Name = "";
}
- bstrftime(sdt, sizeof(sdt), jcr->jr.StartTime);
- bstrftime(edt, sizeof(edt), jcr->jr.EndTime);
-
- Jmsg(jcr, msg_type, 0, _("%s\n\
-JobId: %d\n\
-Job: %s\n\
-FileSet: %s\n\
-Verify Level: %s\n\
-Client: %s\n\
-Start time: %s\n\
-End time: %s\n\
-Files Examined: %s\n\
-Termination: %s\n"),
- edt,
- jcr->jr.JobId,
- jcr->jr.Job,
- jcr->fileset->hdr.name,
- level_to_str(jcr->level),
- jcr->client->hdr.name,
- sdt,
- edt,
- edit_uint_with_commas(jcr->jr.JobFiles, ec1),
- term_msg);
- Dmsg0(100, "Leave verify_cleanup()\n");
- if (jcr->fname) {
- free_memory(jcr->fname);
- jcr->fname = NULL;
+ jobstatus_to_ascii(jcr->FDJobStatus, fd_term_msg, sizeof(fd_term_msg));
+ if (jcr->JobLevel == 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"
+" JobId: %d\n"
+" Job: %s\n"
+" FileSet: %s\n"
+" Verify Level: %s\n"
+" Client: %s\n"
+" Verify JobId: %d\n"
+" Verify Job: %s\n"
+" Start time: %s\n"
+" End time: %s\n"
+" Files Expected: %s\n"
+" Files Examined: %s\n"
+" Non-fatal FD errors: %d\n"
+" 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);
+ } else {
+ Jmsg(jcr, msg_type, 0, _("Bacula %s (%s): %s\n"
+" JobId: %d\n"
+" Job: %s\n"
+" FileSet: %s\n"
+" Verify Level: %s\n"
+" Client: %s\n"
+" Verify JobId: %d\n"
+" Verify Job: %s\n"
+" Start time: %s\n"
+" End time: %s\n"
+" Files Examined: %s\n"
+" 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);
}
+ Dmsg0(100, "Leave verify_cleanup()\n");
}
/*
* This routine is called only during a Verify
*/
-int get_attributes_and_compare_to_catalog(JCR *jcr, int last_full_id)
+int 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 */
+ struct stat statf; /* file stat */
+ struct stat statc; /* catalog stat */
int stat = JS_Terminated;
char buf[MAXSTRING];
- char *fname = (char *)get_pool_memory(PM_MESSAGE);
- int do_MD5 = FALSE;
+ POOLMEM *fname = get_pool_memory(PM_MESSAGE);
+ int do_SIG = NO_SIG;
+ int32_t file_index = 0;
memset(&fdbr, 0, sizeof(FILE_DBR));
fd = jcr->file_bsock;
- fdbr.JobId = last_full_id;
-
+ fdbr.JobId = JobId;
+ jcr->FileIndex = 0;
+
Dmsg0(20, "bdird: waiting to receive file attributes\n");
/*
- * Get Attributes and MD5 Signature from File daemon
+ * Get Attributes and Signature from File daemon
+ * We expect:
+ * FileIndex
+ * Stream
+ * Options or SIG (MD5/SHA1)
+ * Filename
+ * Attributes
+ * Link name ???
*/
- while ((n=bget_msg(fd, 0)) > 0) {
- long file_index, attr_file_index;
+ while ((n=bget_dirmsg(fd)) >= 0 && !job_canceled(jcr)) {
int stream;
- char *attr, *p;
- char Opts_MD5[MAXSTRING]; /* Verify Opts or MD5 signature */
-
- fname = (char *)check_pool_memory_size(fname, fd->msglen);
- jcr->fname = (char *)check_pool_memory_size(jcr->fname, fd->msglen);
- Dmsg1(50, "Atts+MD5=%s\n", fd->msg);
- if ((len = sscanf(fd->msg, "%ld %d %100s %s", &file_index, &stream,
- Opts_MD5, fname)) != 4) {
- Jmsg3(jcr, M_FATAL, 0, _("bird<filed: bad attributes, expected 4 fields got %d\n\
- mslen=%d msg=%s\n"), len, fd->msglen, fd->msg);
- jcr->JobStatus = JS_ErrorTerminated;
- return 0;
+ char *attr, *p, *fn;
+ char Opts_SIG[MAXSTRING]; /* Verify Opts or MD5/SHA1 signature */
+
+ fname = check_pool_memory_size(fname, fd->msglen);
+ jcr->fname = check_pool_memory_size(jcr->fname, fd->msglen);
+ Dmsg1(200, "Atts+SIG=%s\n", fd->msg);
+ if ((len = sscanf(fd->msg, "%ld %d %100s", &file_index, &stream,
+ fname)) != 3) {
+ Jmsg3(jcr, M_FATAL, 0, _("bird<filed: bad attributes, expected 3 fields got %d\n"
+" mslen=%d msg=%s\n"), len, fd->msglen, fd->msg);
+ return false;
}
+ /*
+ * We read the Options or Signature into fname
+ * to prevent overrun, now copy it to proper location.
+ */
+ bstrncpy(Opts_SIG, fname, sizeof(Opts_SIG));
+ p = fd->msg;
+ skip_nonspaces(&p); /* skip FileIndex */
+ skip_spaces(&p);
+ skip_nonspaces(&p); /* skip Stream */
+ skip_spaces(&p);
+ skip_nonspaces(&p); /* skip Opts_SIG */
+ p++; /* skip space */
+ fn = fname;
+ while (*p != 0) {
+ *fn++ = *p++; /* copy filename */
+ }
+ *fn = *p++; /* term filename and point to attribs */
+ attr = p;
/*
* Got attributes stream, decode it
*/
- if (stream == STREAM_UNIX_ATTRIBUTES) {
- attr_file_index = file_index; /* remember attribute file_index */
- len = strlen(fd->msg);
- attr = &fd->msg[len+1];
- decode_stat(attr, &statf); /* decode file stat packet */
- do_MD5 = FALSE;
- jcr->fn_printed = FALSE;
- strip_trailing_junk(fname);
- strcpy(jcr->fname, fname); /* move filename into JCR */
+ if (stream == STREAM_UNIX_ATTRIBUTES || stream == STREAM_UNIX_ATTRIBUTES_EX) {
+ int32_t LinkFIf, LinkFIc;
+ Dmsg2(400, "file_index=%d attr=%s\n", file_index, attr);
+ jcr->JobFiles++;
+ jcr->FileIndex = file_index; /* remember attribute file_index */
+ decode_stat(attr, &statf, &LinkFIf); /* decode file stat packet */
+ do_SIG = NO_SIG;
+ jcr->fn_printed = false;
+ pm_strcpy(jcr->fname, fname); /* move filename into JCR */
Dmsg2(040, "dird<filed: stream=%d %s\n", stream, jcr->fname);
- Dmsg1(20, "dird<filed: attr=%s\n", attr);
-
- /*
- * Find equivalent record in the database
- */
- fdbr.FileId = 0;
- if (!db_get_file_attributes_record(jcr->db, jcr->fname, &fdbr)) {
+ Dmsg1(020, "dird<filed: attr=%s\n", attr);
+
+ /*
+ * Find equivalent record in the database
+ */
+ fdbr.FileId = 0;
+ if (!db_get_file_attributes_record(jcr, jcr->db, jcr->fname,
+ &jcr->target_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;
- continue;
- } else {
- /*
- * mark file record as visited by stuffing the
- * current JobId, which is unique, into the FileIndex
- */
- db_mark_file_record(jcr->db, fdbr.FileId, jcr->JobId);
- }
-
- Dmsg3(100, "Found %s in catalog. inx=%d Opts=%s\n", jcr->fname,
- file_index, Opts_MD5);
- decode_stat(fdbr.LStat, &statc); /* decode catalog stat */
- /*
- * Loop over options supplied by user and verify the
- * fields he requests.
- */
- for (p=Opts_MD5; *p; p++) {
- switch (*p) {
+ stat = JS_Differences;
+ continue;
+ } else {
+ /*
+ * mark file record as visited by stuffing the
+ * current JobId, which is unique, into the MarkId field.
+ */
+ db_mark_file_record(jcr, jcr->db, fdbr.FileId, jcr->JobId);
+ }
+
+ Dmsg3(400, "Found %s in catalog. inx=%d Opts=%s\n", jcr->fname,
+ file_index, Opts_SIG);
+ decode_stat(fdbr.LStat, &statc, &LinkFIc); /* decode catalog stat */
+ /*
+ * Loop over options supplied by user and verify the
+ * fields he requests.
+ */
+ for (p=Opts_SIG; *p; p++) {
+ char ed1[30], ed2[30];
+ switch (*p) {
case 'i': /* compare INODEs */
- if (statc.st_ino != statf.st_ino) {
- prt_fname(jcr);
- Jmsg(jcr, M_INFO, 0, _(" st_ino differ. Cat: %x File: %x\n"),
- statc.st_ino, statf.st_ino);
- stat = JS_Differences;
- }
- break;
+ if (statc.st_ino != statf.st_ino) {
+ prt_fname(jcr);
+ 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;
+ }
+ break;
case 'p': /* permissions bits */
- if (statc.st_mode != statf.st_mode) {
- prt_fname(jcr);
- Jmsg(jcr, M_INFO, 0, _(" st_mode differ. Cat: %x File: %x\n"),
- statc.st_mode, statf.st_mode);
- stat = JS_Differences;
- }
- break;
+ if (statc.st_mode != statf.st_mode) {
+ 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;
+ }
+ break;
case 'n': /* number of links */
- if (statc.st_nlink != statf.st_nlink) {
- prt_fname(jcr);
- Jmsg(jcr, M_INFO, 0, _(" st_nlink differ. Cat: %d File: %d\n"),
- statc.st_nlink, statf.st_nlink);
- stat = JS_Differences;
- }
- break;
+ if (statc.st_nlink != statf.st_nlink) {
+ 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;
+ }
+ break;
case 'u': /* user id */
- if (statc.st_uid != statf.st_uid) {
- prt_fname(jcr);
- Jmsg(jcr, M_INFO, 0, _(" st_uid differ. Cat: %d File: %d\n"),
- statc.st_uid, statf.st_uid);
- stat = JS_Differences;
- }
- break;
+ if (statc.st_uid != statf.st_uid) {
+ 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;
+ }
+ break;
case 'g': /* group id */
- if (statc.st_gid != statf.st_gid) {
- prt_fname(jcr);
- Jmsg(jcr, M_INFO, 0, _(" st_gid differ. Cat: %d File: %d\n"),
- statc.st_gid, statf.st_gid);
- stat = JS_Differences;
- }
- break;
+ if (statc.st_gid != statf.st_gid) {
+ 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;
+ }
+ break;
case 's': /* size */
- if (statc.st_size != statf.st_size) {
- prt_fname(jcr);
- Jmsg(jcr, M_INFO, 0, _(" st_size differ. Cat: %d File: %d\n"),
- statc.st_size, statf.st_size);
- stat = JS_Differences;
- }
- break;
+ if (statc.st_size != statf.st_size) {
+ prt_fname(jcr);
+ 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;
+ }
+ break;
case 'a': /* access time */
- if (statc.st_atime != statf.st_atime) {
- prt_fname(jcr);
+ if (statc.st_atime != statf.st_atime) {
+ prt_fname(jcr);
Jmsg(jcr, M_INFO, 0, _(" st_atime differs\n"));
- stat = JS_Differences;
- }
- break;
+ stat = JS_Differences;
+ }
+ break;
case 'm':
- if (statc.st_mtime != statf.st_mtime) {
- prt_fname(jcr);
+ if (statc.st_mtime != statf.st_mtime) {
+ prt_fname(jcr);
Jmsg(jcr, M_INFO, 0, _(" st_mtime differs\n"));
- stat = JS_Differences;
- }
- break;
+ stat = JS_Differences;
+ }
+ break;
case 'c': /* ctime */
- if (statc.st_ctime != statf.st_ctime) {
- prt_fname(jcr);
+ if (statc.st_ctime != statf.st_ctime) {
+ prt_fname(jcr);
Jmsg(jcr, M_INFO, 0, _(" st_ctime differs\n"));
- stat = JS_Differences;
- }
- break;
+ stat = JS_Differences;
+ }
+ break;
case 'd': /* file size decrease */
- if (statc.st_size > statf.st_size) {
- prt_fname(jcr);
- Jmsg(jcr, M_INFO, 0, _(" st_size decrease. Cat: %d File: %d\n"),
- statc.st_size, statf.st_size);
- stat = JS_Differences;
- }
- break;
+ if (statc.st_size > statf.st_size) {
+ prt_fname(jcr);
+ 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;
+ }
+ break;
case '5': /* compare MD5 */
Dmsg1(500, "set Do_MD5 for %s\n", jcr->fname);
- do_MD5 = TRUE;
- break;
+ do_SIG = MD5_SIG;
+ break;
+ case '1': /* compare SHA1 */
+ do_SIG = SHA1_SIG;
+ break;
case ':':
case 'V':
- default:
- break;
- }
- }
+ default:
+ break;
+ }
+ }
/*
- * Got MD5 Signature from Storage daemon
- * It came across in the Opts_MD5 field.
+ * Got SIG Signature from Storage daemon
+ * It came across in the Opts_SIG field.
*/
- } else if (stream == STREAM_MD5_SIGNATURE) {
- Dmsg2(100, "stream=MD5 inx=%d fname=%s\n", file_index, jcr->fname);
- /*
- * When ever we get an MD5 signature is MUST have been
- * preceded by an attributes record, which sets attr_file_index
- */
- if (attr_file_index != file_index) {
- Jmsg2(jcr, M_FATAL, 0, _("MD5 index %d not same as attributes %d\n"),
- file_index, attr_file_index);
- jcr->JobStatus = JS_ErrorTerminated;
- return 0;
- }
- if (do_MD5) {
- db_escape_string(buf, Opts_MD5, strlen(Opts_MD5));
- if (strcmp(buf, fdbr.MD5) != 0) {
- prt_fname(jcr);
- if (debug_level >= 10) {
- Jmsg(jcr, M_INFO, 0, _(" MD5 not same. File=%s Cat=%s\n"), buf, fdbr.MD5);
- } else {
- Jmsg(jcr, M_INFO, 0, _(" MD5 differs.\n"));
- }
- stat = JS_Differences;
- }
- do_MD5 = FALSE;
- }
+ } else if (stream == STREAM_MD5_SIGNATURE || stream == STREAM_SHA1_SIGNATURE) {
+ Dmsg2(400, "stream=SIG inx=%d SIG=%s\n", file_index, Opts_SIG);
+ /*
+ * When ever we get a signature is 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;
+ }
+ if (do_SIG) {
+ db_escape_string(buf, Opts_SIG, strlen(Opts_SIG));
+ if (strcmp(buf, fdbr.SIG) != 0) {
+ prt_fname(jcr);
+ if (debug_level >= 10) {
+ Jmsg(jcr, M_INFO, 0, _(" %s not same. File=%s Cat=%s\n"),
+ stream==STREAM_MD5_SIGNATURE?"MD5":"SHA1", buf, fdbr.SIG);
+ } else {
+ Jmsg(jcr, M_INFO, 0, _(" %s differs.\n"),
+ stream==STREAM_MD5_SIGNATURE?"MD5":"SHA1");
+ }
+ stat = JS_Differences;
+ }
+ do_SIG = FALSE;
+ }
}
- jcr->jr.JobFiles = file_index;
- }
- if (n < 0) {
+ jcr->JobFiles = file_index;
+ }
+ if (is_bnet_error(fd)) {
+ berrno be;
Jmsg2(jcr, M_FATAL, 0, _("bdird<filed: bad attributes from filed n=%d : %s\n"),
- n, strerror(errno));
- jcr->JobStatus = JS_ErrorTerminated;
- return 0;
+ n, be.strerror());
+ return false;
}
/* Now find all the files that are missing -- i.e. all files in
- * the database where the FileIndex != current JobId
+ * the database where the MarkedId != current JobId
*/
- jcr->fn_printed = FALSE;
- sprintf(buf,
+ jcr->fn_printed = false;
+ bsnprintf(buf, sizeof(buf),
"SELECT Path.Path,Filename.Name FROM File,Path,Filename "
"WHERE File.JobId=%d "
-"AND File.FileIndex!=%d AND File.PathId=Path.PathId "
-"AND File.FilenameId=Filename.FilenameId",
- last_full_id, jcr->JobId);
+"AND File.MarkedId!=%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;
}
- jcr->JobStatus = stat;
- return 1;
+ free_pool_memory(fname);
+ set_jcr_job_status(jcr, stat);
+ return stat == JS_Terminated;
}
/*
* We are called here for each record that matches the above
* SQL query -- that is for each file contained in the Catalog
* that was not marked earlier. This means that the file in
- * question is a missing file (in the Catalog but on on Disk).
+ * question is a missing file (in the Catalog but not on Disk).
*/
static int missing_handler(void *ctx, int num_fields, char **row)
{
if (!jcr->fn_printed) {
Jmsg(jcr, M_INFO, 0, "\n");
Jmsg(jcr, M_INFO, 0, _("The following files are missing:\n"));
- jcr->fn_printed = TRUE;
+ jcr->fn_printed = true;
}
Jmsg(jcr, M_INFO, 0, " %s%s\n", row[0]?row[0]:"", row[1]?row[1]:"");
return 0;
}
-/*
+/*
* Print filename for verify
*/
static void prt_fname(JCR *jcr)
projects / bacula / bacula / blobdiff