/*
Bacula® - The Network Backup Solution
- Copyright (C) 2000-2009 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2011 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
+ 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.
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
+ 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.
* When the File daemon sends the attributes, compare them to
* what is in the DB.
*
- * Version $Id$
*/
if (!allow_duplicate_job(jcr)) {
return false;
}
- switch (jcr->get_JobLevel()) {
+ switch (jcr->getJobLevel()) {
case L_VERIFY_INIT:
case L_VERIFY_CATALOG:
case L_VERIFY_DISK_TO_CATALOG:
case L_VERIFY_DATA:
break;
default:
- Jmsg2(jcr, M_FATAL, 0, _("Unimplemented Verify level %d(%c)\n"), jcr->get_JobLevel(),
- jcr->get_JobLevel());
+ Jmsg2(jcr, M_FATAL, 0, _("Unimplemented Verify level %d(%c)\n"), jcr->getJobLevel(),
+ jcr->getJobLevel());
return false;
}
return true;
* For VERIFY_VOLUME_TO_CATALOG, we want the JobId of the
* last backup Job.
*/
- if (jcr->get_JobLevel() == L_VERIFY_CATALOG ||
- jcr->get_JobLevel() == L_VERIFY_VOLUME_TO_CATALOG ||
- jcr->get_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->get_JobLevel() == L_VERIFY_VOLUME_TO_CATALOG ||
- jcr->get_JobLevel() == L_VERIFY_DISK_TO_CATALOG)) {
- Name = jcr->verify_job->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->get_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"));
+
+ /* see if user supplied a jobid= as run argument or from menu */
+ if (jcr->RestoreJobId) {
+ verify_jobid = jcr->RestoreJobId;
+ Dmsg1(100, "Supplied jobid=%d\n", verify_jobid);
+
+ } else {
+ if (!db_find_last_jobid(jcr, jcr->db, Name, &jr)) {
+ 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"
+ "running the current Job.\n"));
+ } else {
+ Jmsg(jcr, M_FATAL, 0, _(
+ "Unable to find JobId of previous Job for this client.\n"));
+ }
+ return false;
}
- return false;
+ verify_jobid = jr.JobId;
}
- 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->get_JobLevel() == L_VERIFY_CATALOG ||
- jcr->get_JobLevel() == L_VERIFY_VOLUME_TO_CATALOG ||
- jcr->get_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) {
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"),
* create a dummy authorization key (passed to
* File daemon but not used).
*/
- if (jcr->get_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->get_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->previous_jr.ClientId, jcr->get_JobLevel());
+ 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));
/* 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->get_JobLevel()), jcr->Job);
+ edit_uint64(jcr->JobId, ed1), level_to_str(jcr->getJobLevel()), jcr->Job);
- if (jcr->get_JobLevel() == L_VERIFY_VOLUME_TO_CATALOG) {
+ if (jcr->getJobLevel() == L_VERIFY_VOLUME_TO_CATALOG) {
BSOCK *sd;
/*
* Start conversation with Storage daemon
*/
- set_jcr_job_status(jcr, JS_Blocked);
+ jcr->setJobStatus(JS_Blocked);
if (!connect_to_storage_daemon(jcr, 10, SDConnectTimeout, 1)) {
return false;
}
* OK, now connect to the File daemon
* and ask him for the files.
*/
- set_jcr_job_status(jcr, JS_Blocked);
+ jcr->setJobStatus(JS_Blocked);
if (!connect_to_file_daemon(jcr, 10, FDConnectTimeout, 1)) {
goto bail_out;
}
- set_jcr_job_status(jcr, JS_Running);
+ jcr->setJobStatus(JS_Running);
fd = jcr->file_bsock;
* Send Level command to File daemon, as well
* as the Storage address if appropriate.
*/
- switch (jcr->get_JobLevel()) {
+ switch (jcr->getJobLevel()) {
case L_VERIFY_INIT:
level = "init";
break;
level="disk_to_catalog";
break;
default:
- Jmsg2(jcr, M_FATAL, 0, _("Unimplemented Verify level %d(%c)\n"), jcr->get_JobLevel(),
- jcr->get_JobLevel());
+ Jmsg2(jcr, M_FATAL, 0, _("Unimplemented Verify level %d(%c)\n"), jcr->getJobLevel(),
+ jcr->getJobLevel());
goto bail_out;
}
* catalog depending on the run type.
*/
/* Compare to catalog */
- switch (jcr->get_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 */
break;
default:
- Jmsg1(jcr, M_FATAL, 0, _("Unimplemented verify level %d\n"), jcr->get_JobLevel());
+ Jmsg1(jcr, M_FATAL, 0, _("Unimplemented verify level %d\n"), jcr->getJobLevel());
goto bail_out;
}
// Dmsg1(100, "Enter verify_cleanup() TermCod=%d\n", TermCode);
- Dmsg3(900, "JobLevel=%c Expected=%u JobFiles=%u\n", jcr->get_JobLevel(),
+ Dmsg3(900, "JobLevel=%c Expected=%u JobFiles=%u\n", jcr->getJobLevel(),
jcr->ExpectedFiles, jcr->JobFiles);
- if (jcr->get_JobLevel() == L_VERIFY_VOLUME_TO_CATALOG &&
+ if (jcr->getJobLevel() == L_VERIFY_VOLUME_TO_CATALOG &&
jcr->ExpectedFiles != jcr->JobFiles) {
TermCode = JS_ErrorTerminated;
}
}
jobstatus_to_ascii(jcr->FDJobStatus, fd_term_msg, sizeof(fd_term_msg));
- if (jcr->get_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, _("%s %s %s (%s): %s\n"
+ Jmsg(jcr, msg_type, 0, _("%s %s %s (%s):\n"
" Build OS: %s %s %s\n"
" JobId: %d\n"
" Job: %s\n"
" FD termination status: %s\n"
" SD termination status: %s\n"
" Termination: %s\n\n"),
- BACULA, my_name, VERSION, LSMDATE, edt,
+ BACULA, my_name, VERSION, LSMDATE,
HOST_OS, DISTNAME, DISTVER,
jcr->jr.JobId,
jcr->jr.Job,
jcr->fileset->hdr.name,
- level_to_str(jcr->get_JobLevel()),
+ level_to_str(jcr->getJobLevel()),
jcr->client->hdr.name,
jcr->previous_jr.JobId,
Name,
sd_term_msg,
term_msg);
} else {
- Jmsg(jcr, msg_type, 0, _("%s %s %s (%s): %s\n"
+ Jmsg(jcr, msg_type, 0, _("%s %s %s (%s):\n"
" Build: %s %s %s\n"
" JobId: %d\n"
" Job: %s\n"
" Non-fatal FD errors: %d\n"
" FD termination status: %s\n"
" Termination: %s\n\n"),
- BACULA, my_name, VERSION, LSMDATE, edt,
+ BACULA, my_name, VERSION, LSMDATE,
HOST_OS, DISTNAME, DISTVER,
jcr->jr.JobId,
jcr->jr.Job,
jcr->fileset->hdr.name,
- level_to_str(jcr->get_JobLevel()),
+ level_to_str(jcr->getJobLevel()),
jcr->client->name(),
jcr->previous_jr.JobId,
Name,
char Opts_Digest[MAXSTRING]; /* Verify Opts or MD5/SHA1 digest */
if (job_canceled(jcr)) {
- return;
+ goto bail_out;
}
fname = check_pool_memory_size(fname, fd->msglen);
jcr->fname = check_pool_memory_size(jcr->fname, fd->msglen);
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;
+ goto bail_out;
}
/*
* We read the Options or Signature into fname
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 */
+ decode_stat(attr, &statf, sizeof(statf), &LinkFIf); /* decode file stat packet */
do_Digest = CRYPTO_DIGEST_NONE;
jcr->fn_printed = false;
pm_strcpy(jcr->fname, fname); /* move filename into JCR */
&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);
- set_jcr_job_status(jcr, JS_Differences);
+ jcr->setJobStatus(JS_Differences);
continue;
} else {
/*
Dmsg3(400, "Found %s in catalog. inx=%d Opts=%s\n", jcr->fname,
file_index, Opts_Digest);
- decode_stat(fdbr.LStat, &statc, &LinkFIc); /* decode catalog stat */
+ decode_stat(fdbr.LStat, &statc, sizeof(statc), &LinkFIc); /* decode catalog stat */
/*
* Loop over options supplied by user and verify the
* fields he requests.
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));
- set_jcr_job_status(jcr, JS_Differences);
+ jcr->setJobStatus(JS_Differences);
}
break;
case 'p': /* permissions bits */
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);
- set_jcr_job_status(jcr, JS_Differences);
+ jcr->setJobStatus(JS_Differences);
}
break;
case 'n': /* number of links */
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);
- set_jcr_job_status(jcr, JS_Differences);
+ jcr->setJobStatus(JS_Differences);
}
break;
case 'u': /* user id */
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);
- set_jcr_job_status(jcr, JS_Differences);
+ jcr->setJobStatus(JS_Differences);
}
break;
case 'g': /* group id */
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);
- set_jcr_job_status(jcr, JS_Differences);
+ jcr->setJobStatus(JS_Differences);
}
break;
case 's': /* 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));
- set_jcr_job_status(jcr, JS_Differences);
+ jcr->setJobStatus(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"));
- set_jcr_job_status(jcr, JS_Differences);
+ jcr->setJobStatus(JS_Differences);
}
break;
case 'm':
if (statc.st_mtime != statf.st_mtime) {
prt_fname(jcr);
Jmsg(jcr, M_INFO, 0, _(" st_mtime differs\n"));
- set_jcr_job_status(jcr, JS_Differences);
+ jcr->setJobStatus(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"));
- set_jcr_job_status(jcr, JS_Differences);
+ jcr->setJobStatus(JS_Differences);
}
break;
case 'd': /* file size decrease */
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));
- set_jcr_job_status(jcr, JS_Differences);
+ jcr->setJobStatus(JS_Differences);
}
break;
case '5': /* compare MD5 */
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;
+ goto bail_out;
}
if (do_Digest != CRYPTO_DIGEST_NONE) {
db_escape_string(jcr, jcr->db, buf, Opts_Digest, strlen(Opts_Digest));
prt_fname(jcr);
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);
+ jcr->setJobStatus(JS_Differences);
}
do_Digest = CRYPTO_DIGEST_NONE;
}
berrno be;
Jmsg2(jcr, M_FATAL, 0, _("bdird<filed: bad attributes from filed n=%d : %s\n"),
n, be.bstrerror());
- return;
+ goto bail_out;
}
/* Now find all the files that are missing -- i.e. all files in
/* missing_handler is called for each file found */
db_sql_query(jcr->db, buf, missing_handler, (void *)jcr);
if (jcr->fn_printed) {
- set_jcr_job_status(jcr, JS_Differences);
+ jcr->setJobStatus(JS_Differences);
}
+
+bail_out:
free_pool_memory(fname);
}
}
if (!jcr->fn_printed) {
Qmsg(jcr, M_WARNING, 0, _("The following files are in the Catalog but not on %s:\n"),
- jcr->get_JobLevel() == L_VERIFY_VOLUME_TO_CATALOG ? "the Volume(s)" : "disk");
+ jcr->getJobLevel() == L_VERIFY_VOLUME_TO_CATALOG ? "the Volume(s)" : "disk");
jcr->fn_printed = true;
}
Qmsg(jcr, M_INFO, 0, " %s%s\n", row[0]?row[0]:"", row[1]?row[1]:"");
projects / bacula / bacula / blobdiff