+/*
+ Bacula® - The Network Backup Solution
+
+ Copyright (C) 2002-2007 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 plus additions
+ that are listed in the file LICENSE.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA.
+
+ Bacula® is a registered trademark of John Walker.
+ The licensor of Bacula is the Free Software Foundation Europe
+ (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
+ Switzerland, email:ftf@fsfeurope.org.
+*/
/*
* Match Bootstrap Records (used for restores) against
* Volume Records
*/
/*
- 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.
-
- 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.
-
+ * ***FIXME***
+ * find_smallest_volfile needs to be fixed to only look at items that
+ * are not marked as done. Otherwise, it can find a bsr
+ * that has already been consumed, and this will cause the
+ * bsr to be used, thus we may seek back and re-read the
+ * same records, causing an error. This deficiency must
+ * be fixed. For the moment, it has been kludged in
+ * read_record.c to avoid seeking back if find_next_bsr
+ * returns a bsr pointing to a smaller address (file/block).
+ *
+ * Also for efficiency, once a bsr is done, it really should be
+ * delinked from the bsr chain. This will avoid the above
+ * problem and make traversal of the bsr chain more efficient.
+ *
+ * To be done ...
*/
#include "bacula.h"
#include "lib/fnmatch.h"
#endif
+const int dbglevel = 500;
+
/* Forward references */
static int match_volume(BSR *bsr, BSR_VOLUME *volume, VOLUME_LABEL *volrec, bool done);
static int match_sesstime(BSR *bsr, BSR_SESSTIME *sesstime, DEV_RECORD *rec, bool done);
BSR *bsr;
BSR *found_bsr = NULL;
+ /* Do tape/disk seeking only if CAP_POSITIONBLOCKS is on */
if (!root_bsr || !root_bsr->use_positioning ||
- !root_bsr->reposition /* || !dev->is_tape()*/) {
- Dmsg2(100, "No nxt_bsr use_pos=%d repos=%d\n", root_bsr->use_positioning, root_bsr->reposition);
+ !root_bsr->reposition || !dev->has_cap(CAP_POSITIONBLOCKS)) {
+ Dmsg2(dbglevel, "No nxt_bsr use_pos=%d repos=%d\n", root_bsr->use_positioning, root_bsr->reposition);
return NULL;
}
- Dmsg2(100, "use_pos=%d repos=%d\n", root_bsr->use_positioning, root_bsr->reposition);
+ Dmsg2(dbglevel, "use_pos=%d repos=%d\n", root_bsr->use_positioning, root_bsr->reposition);
root_bsr->mount_next_volume = false;
+ /* Walk through all bsrs to find the next one to use => smallest file,block */
for (bsr=root_bsr; bsr; bsr=bsr->next) {
if (bsr->done || !match_volume(bsr, bsr->volume, &dev->VolHdr, 1)) {
continue;
return found_bsr;
}
+/*
+ * ***FIXME***
+ * This routine needs to be fixed to only look at items that
+ * are not marked as done. Otherwise, it can find a bsr
+ * that has already been consumed, and this will cause the
+ * bsr to be used, thus we may seek back and re-read the
+ * same records, causing an error. This deficiency must
+ * be fixed. For the moment, it has been kludged in
+ * read_record.c to avoid seeking back if find_next_bsr
+ * returns a bsr pointing to a smaller address (file/block).
+ */
static BSR *find_smallest_volfile(BSR *found_bsr, BSR *bsr)
{
BSR *return_bsr = found_bsr;
uint32_t found_bsr_sfile, bsr_sfile;
uint32_t found_bsr_sblock, bsr_sblock;
+ /* Find the smallest file in the found_bsr */
vf = found_bsr->volfile;
found_bsr_sfile = vf->sfile;
while ( (vf=vf->next) ) {
found_bsr_sfile = vf->sfile;
}
}
+
+ /* Find the smallest file in the bsr */
vf = bsr->volfile;
bsr_sfile = vf->sfile;
while ( (vf=vf->next) ) {
bsr_sfile = vf->sfile;
}
}
+
+ /* if the bsr file is less than the found_bsr file, return bsr */
if (found_bsr_sfile > bsr_sfile) {
return_bsr = bsr;
} else if (found_bsr_sfile == bsr_sfile) {
- /* Must check block */
+ /* Files are equal */
+ /* find smallest block in found_bsr */
vb = found_bsr->volblock;
found_bsr_sblock = vb->sblock;
while ( (vb=vb->next) ) {
found_bsr_sblock = vb->sblock;
}
}
+ /* Find smallest block in bsr */
vb = bsr->volblock;
bsr_sblock = vb->sblock;
while ( (vb=vb->next) ) {
bsr_sblock = vb->sblock;
}
}
+ /* Compare and return the smallest */
if (found_bsr_sblock > bsr_sblock) {
return_bsr = bsr;
}
}
-
return return_bsr;
}
/*
- * Called to tell the matcher that the end of
- * the current file has been reached.
+ * Called after the signature record so that
+ * we can see if the current bsr has been
+ * fully processed (i.e. is done).
* The bsr argument is not used, but is included
* for consistency with the other match calls.
*
* Returns: true if we should reposition
* : false otherwise.
*/
-bool match_set_eof(BSR *bsr, DEV_RECORD *rec)
+bool is_this_bsr_done(BSR *bsr, DEV_RECORD *rec)
{
BSR *rbsr = rec->bsr;
- Dmsg1(100, "match_set %d\n", rbsr != NULL);
+ Dmsg1(dbglevel, "match_set %d\n", rbsr != NULL);
if (!rbsr) {
return false;
}
if (rbsr->count && rbsr->found >= rbsr->count) {
rbsr->done = true;
rbsr->root->reposition = true;
- Dmsg2(100, "match_set_eof reposition count=%d found=%d\n",
+ Dmsg2(dbglevel, "is_end_this_bsr set reposition=1 count=%d found=%d\n",
rbsr->count, rbsr->found);
return true;
}
SESSION_LABEL *sessrec, bool done)
{
if (bsr->done) {
+// Dmsg0(dbglevel, "bsr->done set\n");
goto no_match;
}
if (!match_volume(bsr, bsr->volume, volrec, 1)) {
+ Dmsg2(dbglevel, "bsr fail vol=%s != rec vol=%s\n", bsr->volume->VolumeName,
+ volrec->VolumeName);
goto no_match;
}
if (!match_volfile(bsr, bsr->volfile, rec, 1)) {
- Dmsg2(100, "Fail on file. bsr=%d rec=%d\n", bsr->volfile->efile,
- rec->File);
+ Dmsg3(dbglevel, "Fail on file=%d. bsr=%d,%d\n",
+ rec->File, bsr->volfile->sfile, bsr->volfile->efile);
goto no_match;
}
if (!match_sesstime(bsr, bsr->sesstime, rec, 1)) {
- Dmsg2(100, "Fail on sesstime. bsr=%d rec=%d\n",
+ Dmsg2(dbglevel, "Fail on sesstime. bsr=%d rec=%d\n",
bsr->sesstime->sesstime, rec->VolSessionTime);
goto no_match;
}
/* NOTE!! This test MUST come after the sesstime test */
if (!match_sessid(bsr, bsr->sessid, rec)) {
- Dmsg2(100, "Fail on sessid. bsr=%d rec=%d\n",
+ Dmsg2(dbglevel, "Fail on sessid. bsr=%d rec=%d\n",
bsr->sessid->sessid, rec->VolSessionId);
goto no_match;
}
/* NOTE!! This test MUST come after sesstime and sessid tests */
if (!match_findex(bsr, bsr->FileIndex, rec, 1)) {
- Dmsg2(100, "Fail on findex. bsr=%d rec=%d\n",
- bsr->FileIndex->findex2, rec->FileIndex);
+ Dmsg3(dbglevel, "Fail on findex=%d. bsr=%d,%d\n",
+ rec->FileIndex, bsr->FileIndex->findex, bsr->FileIndex->findex2);
goto no_match;
}
/*
* the rec->bsr = bsr optimization above.
*/
if (!match_jobid(bsr, bsr->JobId, sessrec, 1)) {
+ Dmsg0(dbglevel, "fail on JobId\n");
goto no_match;
}
if (!match_job(bsr, bsr->job, sessrec, 1)) {
+ Dmsg0(dbglevel, "fail on Job\n");
goto no_match;
}
if (!match_client(bsr, bsr->client, sessrec, 1)) {
+ Dmsg0(dbglevel, "fail on Client\n");
goto no_match;
}
if (!match_job_type(bsr, bsr->JobType, sessrec, 1)) {
+ Dmsg0(dbglevel, "fail on Job type\n");
goto no_match;
}
if (!match_job_level(bsr, bsr->JobLevel, sessrec, 1)) {
+ Dmsg0(dbglevel, "fail on Job level\n");
goto no_match;
}
if (!match_stream(bsr, bsr->stream, rec, 1)) {
+ Dmsg0(dbglevel, "fail on stream\n");
goto no_match;
}
return 1;
if (!volume) {
return 0; /* Volume must match */
}
- if (strcmp(volume->VolumeName, volrec->VolName) == 0) {
+ if (strcmp(volume->VolumeName, volrec->VolumeName) == 0) {
return 1;
}
if (volume->next) {
if (!(rec->state & REC_ISTAPE)) {
return 1; /* All File records OK for this match */
}
-// Dmsg3(100, "match_volfile: sfile=%d efile=%d recfile=%d\n",
+// Dmsg3(dbglevel, "match_volfile: sfile=%d efile=%d recfile=%d\n",
// volfile->sfile, volfile->efile, rec->File);
if (volfile->sfile <= rec->File && volfile->efile >= rec->File) {
return 1;
if (volfile->done && done) {
bsr->done = true;
bsr->root->reposition = true;
- Dmsg2(100, "bsr done from volfile rec=%d volefile=%d\n",
+ Dmsg2(dbglevel, "bsr done from volfile rec=%d volefile=%d\n",
rec->File, volfile->efile);
}
return 0;
if (sesstime->done && done) {
bsr->done = true;
bsr->root->reposition = true;
- Dmsg0(100, "bsr done from sesstime\n");
+ Dmsg0(dbglevel, "bsr done from sesstime\n");
}
return 0;
}
* ***FIXME*** optimizations
* We could optimize a lot here by removing the recursion, and
* stopping the search earlier -- say when rec->FileIndex > findex->findex2
- * and findex->next == NULL. Also, the current entry tests could be skipped
- * if findex->done is set.
+ * and findex->next == NULL.
*/
static int match_findex(BSR *bsr, BSR_FINDEX *findex, DEV_RECORD *rec, bool done)
{
if (!findex) {
return 1; /* no specification matches all */
}
- if (findex->findex <= rec->FileIndex && findex->findex2 >= rec->FileIndex) {
- return 1;
- }
- if (rec->FileIndex > findex->findex2) {
- findex->done = true;
+ if (!findex->done) {
+ if (findex->findex <= rec->FileIndex && findex->findex2 >= rec->FileIndex) {
+ Dmsg3(dbglevel, "Match on findex=%d. bsr=%d,%d\n",
+ rec->FileIndex, findex->findex, findex->findex2);
+ return 1;
+ }
+ if (rec->FileIndex > findex->findex2) {
+ findex->done = true;
+ }
}
if (findex->next) {
return match_findex(bsr, findex->next, rec, findex->done && done);
if (findex->done && done) {
bsr->done = true;
bsr->root->reposition = true;
- Dmsg1(100, "bsr done from findex %d\n", rec->FileIndex);
+ Dmsg1(dbglevel, "bsr done from findex %d\n", rec->FileIndex);
}
return 0;
}
projects / bacula / bacula / blobdiff