*
* 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
*/
/*
- Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker
+ Copyright (C) 2000-2004 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
#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 level=%s\n";
-static char storaddr[] = "storage address=%s port=%d\n";
+static char storaddr[] = "storage address=%s port=%d ssl=0\n";
static char sessioncmd[] = "session %s %ld %ld %ld %ld %ld %ld\n";
/* Responses received from File daemon */
*/
int do_verify(JCR *jcr)
{
- char *level;
+ char *level, *Name;
BSOCK *fd;
- JOB_DBR jr;
- JobId_t JobId = 0;
+ JOB_DBR jr, verify_jr;
+ JobId_t verify_jobid = 0;
+ int stat;
+ memset(&verify_jr, 0, sizeof(verify_jr));
+ if (!jcr->verify_jr) {
+ jcr->verify_jr = &verify_jr;
+ }
if (!get_or_create_client_record(jcr)) {
goto bail_out;
}
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) {
- memcpy(&jr, &(jcr->jr), sizeof(jr));
- if (!db_find_last_jobid(jcr->db, &jr)) {
- Jmsg(jcr, M_FATAL, 0, _("Unable to find last full verify. %s"),
- db_strerror(jcr->db));
+ 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->job->verify_job &&
+ (jcr->JobLevel == L_VERIFY_VOLUME_TO_CATALOG ||
+ jcr->JobLevel == L_VERIFY_DISK_TO_CATALOG)) {
+ Name = jcr->job->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"));
+ }
goto bail_out;
}
- JobId = jr.JobId;
- Dmsg1(20, "Last full id=%d\n", JobId);
+ verify_jobid = jr.JobId;
+ Dmsg1(100, "Last full jobid=%d\n", verify_jobid);
}
jcr->jr.JobId = jcr->JobId;
jcr->jr.StartTime = jcr->start_time;
jcr->jr.Level = jcr->JobLevel;
- if (!db_update_job_start_record(jcr->db, &jcr->jr)) {
+ if (!db_update_job_start_record(jcr, jcr->db, &jcr->jr)) {
Jmsg(jcr, M_FATAL, 0, "%s", db_strerror(jcr->db));
goto bail_out;
}
if (!jcr->fname) {
- jcr->fname = (char *) get_pool_memory(PM_FNAME);
+ jcr->fname = get_pool_memory(PM_FNAME);
}
- jcr->jr.JobId = JobId; /* save target JobId */
-
/* Print Job Start message */
- Jmsg(jcr, M_INFO, 0, _("Start Verify JobId %d Job=%s\n"),
- jcr->JobId, jcr->Job);
-
- if (jcr->JobLevel == L_VERIFY_CATALOG || jcr->JobLevel == L_VERIFY_VOLUME_TO_CATALOG) {
- memset(&jr, 0, sizeof(jr));
- jr.JobId = JobId;
- if (!db_get_job_record(jcr->db, &jr)) {
- Jmsg(jcr, M_FATAL, 0, _("Could not get job record. %s"), db_strerror(jcr->db));
+ Jmsg(jcr, M_INFO, 0, _("Start Verify JobId=%d Level=%s Job=%s\n"),
+ jcr->JobId, level_to_str(jcr->JobLevel), jcr->Job);
+
+ /*
+ * 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) {
+ verify_jr.JobId = verify_jobid;
+ if (!db_get_job_record(jcr, jcr->db, &verify_jr)) {
+ Jmsg(jcr, M_FATAL, 0, _("Could not get job record for previous Job. ERR=%s"),
+ db_strerror(jcr->db));
goto bail_out;
}
- if (jr.JobStatus != 'T') {
+ if (verify_jr.JobStatus != 'T') {
Jmsg(jcr, M_FATAL, 0, _("Last Job %d did not terminate normally. JobStatus=%c\n"),
- JobId, jr.JobStatus);
+ verify_jobid, verify_jr.JobStatus);
goto bail_out;
}
Jmsg(jcr, M_INFO, 0, _("Verifying against JobId=%d Job=%s\n"),
- JobId, jr.Job);
+ verify_jr.JobId, verify_jr.Job);
}
/*
- * If we are verifing a Volume, we need the Storage
+ * 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) {
- /*
- * Now find the Volumes we will need for the Verify
- */
- jcr->VolumeName[0] = 0;
- if (!db_get_job_volume_names(jcr->db, jr.JobId, &jcr->VolumeName) ||
- jcr->VolumeName[0] == 0) {
- Jmsg(jcr, M_FATAL, 0, _("Cannot find Volume Name for verify JobId=%d. %s"),
- jr.JobId, db_strerror(jcr->db));
+ RBSR *bsr = new_bsr();
+ UAContext *ua;
+ bsr->JobId = verify_jr.JobId;
+ ua = new_ua_context(jcr);
+ complete_bsr(ua, bsr);
+ bsr->fi = new_findex();
+ bsr->fi->findex = 1;
+ bsr->fi->findex2 = verify_jr.JobFiles;
+ if (!write_bsr_file(ua, bsr)) {
+ free_ua_context(ua);
+ free_bsr(bsr);
goto bail_out;
}
- Dmsg1(20, "Got job Volume Names: %s\n", jcr->VolumeName);
+ free_ua_context(ua);
+ free_bsr(bsr);
+ if (jcr->RestoreBootstrap) {
+ free(jcr->RestoreBootstrap);
+ }
+ POOLMEM *fname = get_pool_memory(PM_MESSAGE);
+ Mmsg(&fname, "%s/restore.bsr", working_directory);
+ jcr->RestoreBootstrap = bstrdup(fname);
+ free_pool_memory(fname);
+
/*
* Start conversation with Storage daemon
*/
- jcr->JobStatus = JS_Blocked;
+ set_jcr_job_status(jcr, JS_Blocked);
if (!connect_to_storage_daemon(jcr, 10, SDConnectTimeout, 1)) {
goto bail_out;
}
} else {
jcr->sd_auth_key = bstrdup("dummy"); /* dummy Storage daemon key */
}
+
+ if (jcr->JobLevel == L_VERIFY_DISK_TO_CATALOG && jcr->job->verify_job) {
+ jcr->fileset = jcr->job->verify_job->fileset;
+ }
+ Dmsg2(100, "ClientId=%u JobLevel=%c\n", verify_jr.ClientId, jcr->JobLevel);
+
/*
* OK, now connect to the File daemon
* and ask him for the files.
*/
- jcr->JobStatus = JS_Blocked;
+ set_jcr_job_status(jcr, JS_Blocked);
if (!connect_to_file_daemon(jcr, 10, FDConnectTimeout, 1)) {
goto bail_out;
}
- jcr->JobStatus = JS_Running;
+ set_jcr_job_status(jcr, JS_Running);
fd = jcr->file_bsock;
+
Dmsg0(30, ">filed: Send include list\n");
if (!send_include_list(jcr)) {
goto bail_out;
* as the Storage address if appropriate.
*/
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(fd, OKstore, "Storage")) {
- goto bail_out;
- }
+ 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)) {
+ goto bail_out;
+ }
+
+ /*
+ * Send the bootstrap file -- what Volumes/files to restore
+ */
+ if (!send_bootstrap_file(jcr)) {
+ goto bail_out;
+ }
+
+ /*
+ * The following code is deprecated
+ */
+ if (!jcr->RestoreBootstrap) {
/*
* Pass the VolSessionId, VolSessionTime, Start and
* end File and Blocks on the session command.
jr.VolSessionId, jr.VolSessionTime,
jr.StartFile, jr.EndFile, jr.StartBlock,
jr.EndBlock);
- if (!response(fd, OKsession, "Session")) {
+ if (!response(jcr, fd, OKsession, "Session", DISPLAY_ERROR)) {
goto bail_out;
}
- level = "volume";
- break;
- case L_VERIFY_DATA:
- level = "data";
- break;
- default:
- Jmsg1(jcr, M_FATAL, 0, _("Unimplemented save level %d\n"), jcr->JobLevel);
- goto bail_out;
+ }
+ 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 save level %d(%c)\n"), jcr->JobLevel,
+ jcr->JobLevel);
+ goto bail_out;
+ }
+
+ if (!send_run_before_and_after_commands(jcr)) {
+ goto bail_out;
}
/*
* Send verify command/level to File daemon
*/
bnet_fsend(fd, verifycmd, level);
- if (!response(fd, OKverify, "Verify")) {
+ if (!response(jcr, fd, OKverify, "Verify", DISPLAY_ERROR)) {
goto bail_out;
}
switch (jcr->JobLevel) {
case L_VERIFY_CATALOG:
Dmsg0(10, "Verify level=catalog\n");
- get_attributes_and_compare_to_catalog(jcr, JobId);
+ 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, verify_jobid);
break;
case L_VERIFY_VOLUME_TO_CATALOG:
- int stat;
Dmsg0(10, "Verify level=volume\n");
- get_attributes_and_compare_to_catalog(jcr, JobId);
- stat = jcr->JobStatus;
- jcr->JobStatus = JS_WaitSD;
- wait_for_storage_daemon_termination(jcr);
- /* If we terminate normally, use SD term code, else, use ours */
- if (stat == JS_Terminated) {
- jcr->JobStatus = jcr->SDJobStatus;
- } else {
- jcr->JobStatus = stat;
- }
+ get_attributes_and_compare_to_catalog(jcr, verify_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, verify_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;
goto bail_out;
}
- verify_cleanup(jcr, jcr->JobStatus);
+ stat = wait_for_job_termination(jcr);
+ verify_cleanup(jcr, stat);
return 1;
bail_out:
{
char sdt[50], edt[50];
char ec1[30];
- char term_code[100];
+ char term_code[100], fd_term_msg[100], sd_term_msg[100];
char *term_msg;
int msg_type;
JobId_t JobId;
+ char *Name;
- Dmsg0(100, "Enter verify_cleanup()\n");
+// Dmsg1(100, "Enter verify_cleanup() TermCod=%d\n", TermCode);
JobId = jcr->jr.JobId;
- jcr->JobStatus = TermCode;
+ set_jcr_job_status(jcr, TermCode);
update_job_end_record(jcr);
msg_type = M_INFO; /* by default INFO message */
switch (TermCode) {
- case JS_Terminated:
- term_msg = _("Verify OK");
- break;
- case JS_ErrorTerminated:
- 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_ErrorTerminated:
+ term_msg = _("*** Verify Error ***");
+ msg_type = M_ERROR; /* Generate error message */
+ 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;
}
bstrftime(sdt, sizeof(sdt), jcr->jr.StartTime);
bstrftime(edt, sizeof(edt), jcr->jr.EndTime);
+ if (jcr->job->verify_job) {
+ Name = jcr->job->verify_job->hdr.name;
+ } else {
+ Name = "";
+ }
- Jmsg(jcr, msg_type, 0, _("%s\n\
+ 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 " VERSION " (" LSMDATE "): %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\
+SD termination status: %s\n\
Termination: %s\n\n"),
- edt,
- jcr->jr.JobId,
- jcr->jr.Job,
- jcr->fileset->hdr.name,
- level_to_str(jcr->JobLevel),
- jcr->client->hdr.name,
- sdt,
- edt,
- edit_uint64_with_commas(jcr->JobFiles, ec1),
- term_msg);
-
+ edt,
+ jcr->jr.JobId,
+ jcr->jr.Job,
+ jcr->fileset->hdr.name,
+ level_to_str(jcr->JobLevel),
+ jcr->client->hdr.name,
+ jcr->verify_jr->JobId,
+ Name,
+ sdt,
+ edt,
+ edit_uint64_with_commas(jcr->JobFiles, ec1),
+ jcr->Errors,
+ fd_term_msg,
+ sd_term_msg,
+ term_msg);
+ } else {
+ Jmsg(jcr, msg_type, 0, _("Bacula " VERSION " (" LSMDATE "): %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"),
+ edt,
+ jcr->jr.JobId,
+ jcr->jr.Job,
+ jcr->fileset->hdr.name,
+ level_to_str(jcr->JobLevel),
+ jcr->client->hdr.name,
+ jcr->verify_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");
if (jcr->fname) {
free_memory(jcr->fname);
int stat = JS_Terminated;
char buf[MAXSTRING];
POOLMEM *fname = get_pool_memory(PM_MESSAGE);
- int do_MD5 = FALSE;
+ int do_SIG = NO_SIG;
+ long file_index = 0;
memset(&fdbr, 0, sizeof(FILE_DBR));
fd = jcr->file_bsock;
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 MD5
+ * Options or SIG (MD5/SHA1)
* Filename
* Attributes
* Link name ???
*/
- while ((n=bget_msg(fd, 0)) > 0 && !job_cancelled(jcr)) {
- long file_index = 0, attr_file_index = 0;
+ while ((n=bget_dirmsg(fd)) >= 0 && !job_canceled(jcr)) {
int stream;
char *attr, *p, *fn;
- char Opts_MD5[MAXSTRING]; /* Verify Opts or MD5 signature */
+ 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(400, "Atts+MD5=%s\n", fd->msg);
+ Dmsg1(200, "Atts+SIG=%s\n", fd->msg);
if ((len = sscanf(fd->msg, "%ld %d %100s", &file_index, &stream,
- Opts_MD5)) != 3) {
+ 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);
goto bail_out;
}
+ /*
+ * 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_MD5 */
+ skip_nonspaces(&p); /* skip Opts_SIG */
p++; /* skip space */
fn = fname;
while (*p != 0) {
/*
* Got attributes stream, decode it
*/
- if (stream == STREAM_UNIX_ATTRIBUTES) {
+ 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++;
- attr_file_index = file_index; /* remember attribute file_index */
- decode_stat(attr, &statf); /* decode file stat packet */
- do_MD5 = FALSE;
+ 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;
- strcpy(jcr->fname, fname); /* move filename into JCR */
+ pm_strcpy(&jcr->fname, fname); /* move filename into JCR */
Dmsg2(040, "dird<filed: stream=%d %s\n", stream, jcr->fname);
Dmsg1(020, "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)) {
+ if (!db_get_file_attributes_record(jcr, jcr->db, jcr->fname,
+ jcr->verify_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;
* mark file record as visited by stuffing the
* current JobId, which is unique, into the MarkId field.
*/
- db_mark_file_record(jcr->db, fdbr.FileId, jcr->JobId);
+ 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_MD5);
- decode_stat(fdbr.LStat, &statc); /* decode catalog stat */
+ 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_MD5; *p; p++) {
+ 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);
+ 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;
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);
+ (uint32_t)statc.st_mode, (uint32_t)statf.st_mode);
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"),
- statc.st_nlink, statf.st_nlink);
+ (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);
+ 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);
+ 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);
+ 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 '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);
+ 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;
+ do_SIG = MD5_SIG;
+ break;
+ case '1': /* compare SHA1 */
+ do_SIG = SHA1_SIG;
break;
case ':':
case 'V':
}
}
/*
- * 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(400, "stream=MD5 inx=%d MD5=%s\n", file_index, Opts_MD5);
+ } 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 an MD5 signature is MUST have been
+ * When ever we get a 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);
+ 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);
goto bail_out;
}
- if (do_MD5) {
- db_escape_string(buf, Opts_MD5, strlen(Opts_MD5));
- if (strcmp(buf, fdbr.MD5) != 0) {
+ 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, _(" MD5 not same. File=%s Cat=%s\n"), buf, fdbr.MD5);
+ 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, _(" MD5 differs.\n"));
+ Jmsg(jcr, M_INFO, 0, _(" %s differs.\n"),
+ stream==STREAM_MD5_SIGNATURE?"MD5":"SHA1");
}
stat = JS_Differences;
}
- do_MD5 = FALSE;
+ do_SIG = FALSE;
}
}
jcr->JobFiles = file_index;
}
- if (n < 0) {
+ if (is_bnet_error(fd)) {
Jmsg2(jcr, M_FATAL, 0, _("bdird<filed: bad attributes from filed n=%d : %s\n"),
n, strerror(errno));
goto bail_out;
}
/* 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,
stat = JS_Differences;
}
free_pool_memory(fname);
- jcr->JobStatus = stat;
+ set_jcr_job_status(jcr, stat);
return 1;
bail_out:
free_pool_memory(fname);
- jcr->JobStatus = JS_ErrorTerminated;
+ set_jcr_job_status(jcr, JS_ErrorTerminated);
return 0;
}
projects / bacula / bacula / blobdiff