/*
Bacula® - The Network Backup Solution
- Copyright (C) 2002-2008 Free Software Foundation Europe e.V.
+ Copyright (C) 2002-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.
*
* Kern Sibbald, June MMII
*
- * Version $Id$
*/
/*
* ***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.
static int match_jobid(BSR *bsr, BSR_JOBID *jobid, SESSION_LABEL *sessrec, bool done);
static int match_findex(BSR *bsr, BSR_FINDEX *findex, DEV_RECORD *rec, bool done);
static int match_volfile(BSR *bsr, BSR_VOLFILE *volfile, DEV_RECORD *rec, bool done);
-static int match_volblock(BSR *bsr, BSR_VOLBLOCK *volblock, DEV_RECORD *rec, bool done);
+static int match_voladdr(BSR *bsr, BSR_VOLADDR *voladdr, DEV_RECORD *rec, bool done);
static int match_stream(BSR *bsr, BSR_STREAM *stream, DEV_RECORD *rec, bool done);
static int match_all(BSR *bsr, DEV_RECORD *rec, VOLUME_LABEL *volrec, SESSION_LABEL *sessrec, bool done, JCR *jcr);
static int match_block_sesstime(BSR *bsr, BSR_SESSTIME *sesstime, DEV_BLOCK *block);
if (bsr->fileregex_re == NULL)
return 1;
- if (bsr->attr == NULL)
+ if (bsr->attr == NULL) {
bsr->attr = new_attr(jcr);
+ }
- /* The code breaks if the first record associated with a file is
+ /*
+ * The code breaks if the first record associated with a file is
* not of this type
*/
if (rec->Stream == STREAM_UNIX_ATTRIBUTES ||
rec->Stream == STREAM_UNIX_ATTRIBUTES_EX) {
bsr->skip_file = false;
- if (unpack_attributes_record(jcr, rec->Stream, rec->data, bsr->attr)) {
+ if (unpack_attributes_record(jcr, rec->Stream, rec->data, rec->data_len, bsr->attr)) {
if (regexec(bsr->fileregex_re, bsr->attr->fname, 0, NULL, 0) == 0) {
Dmsg2(dbglevel, "Matched pattern, fname=%s FI=%d\n",
bsr->attr->fname, rec->FileIndex);
}
/*
- * ***FIXME***
+ * Get the smallest address from this voladdr part
+ * Don't use "done" elements
+ */
+static bool get_smallest_voladdr(BSR_VOLADDR *va, uint64_t *ret)
+{
+ bool ok=false;
+ uint64_t min_val=0;
+
+ for (; va ; va = va->next) {
+ if (!va->done) {
+ if (ok) {
+ min_val = MIN(min_val, va->saddr);
+ } else {
+ min_val = va->saddr;
+ ok=true;
+ }
+ }
+ }
+ *ret = min_val;
+ return ok;
+}
+
+/* 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
* 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_VOLBLOCK *vb;
uint32_t found_bsr_sfile, bsr_sfile;
uint32_t found_bsr_sblock, bsr_sblock;
+ uint64_t found_bsr_saddr, bsr_saddr;
+
+ /* if we have VolAddr, use it, else try with File and Block */
+ if (get_smallest_voladdr(found_bsr->voladdr, &found_bsr_saddr)) {
+ if (get_smallest_voladdr(bsr->voladdr, &bsr_saddr)) {
+ if (found_bsr_saddr > bsr_saddr) {
+ return bsr;
+ } else {
+ return found_bsr;
+ }
+ }
+ }
/* Find the smallest file in the found_bsr */
vf = found_bsr->volfile;
rbsr->count, rbsr->found);
return true;
}
+ Dmsg2(dbglevel, "is_end_this_bsr not done count=%d found=%d\n",
+ rbsr->count, rbsr->found);
return false;
}
static int match_all(BSR *bsr, DEV_RECORD *rec, VOLUME_LABEL *volrec,
SESSION_LABEL *sessrec, bool done, JCR *jcr)
{
- Dmsg0(050, "Enter match_all\n");
+ Dmsg0(dbglevel, "Enter match_all\n");
if (bsr->done) {
// Dmsg0(dbglevel, "bsr->done set\n");
goto no_match;
volrec->VolumeName);
if (!match_volfile(bsr, bsr->volfile, rec, 1)) {
- Dmsg3(dbglevel, "Fail on file=%d. bsr=%d,%d\n",
- rec->File, bsr->volfile->sfile, bsr->volfile->efile);
+ if (bsr->volfile) {
+ Dmsg3(dbglevel, "Fail on file=%u. bsr=%u,%u\n",
+ rec->File, bsr->volfile->sfile, bsr->volfile->efile);
+ }
goto no_match;
}
- Dmsg3(dbglevel, "OK bsr file=%d. bsr=%d,%d\n",
- rec->File, bsr->volfile->sfile, bsr->volfile->efile);
- if (!match_volblock(bsr, bsr->volblock, rec, 1)) {
- Dmsg3(dbglevel, "Fail on Block=%d. bsr=%d,%d\n",
- rec->Block, bsr->volblock->sblock, bsr->volblock->eblock);
+ if (!match_voladdr(bsr, bsr->voladdr, rec, 1)) {
+ if (bsr->voladdr) {
+ Dmsg3(dbglevel, "Fail on Addr=%llu. bsr=%llu,%llu\n",
+ get_record_address(rec), bsr->voladdr->saddr, bsr->voladdr->eaddr);
+ }
goto no_match;
}
- Dmsg3(dbglevel, "OK bsr Block=%d. bsr=%d,%d\n",
- rec->Block, bsr->volblock->sblock, bsr->volblock->eblock);
if (!match_sesstime(bsr, bsr->sesstime, rec, 1)) {
- Dmsg2(dbglevel, "Fail on sesstime. bsr=%d rec=%d\n",
+ Dmsg2(dbglevel, "Fail on sesstime. bsr=%u rec=%u\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(dbglevel, "Fail on sessid. bsr=%d rec=%d\n",
+ Dmsg2(dbglevel, "Fail on sessid. bsr=%u rec=%u\n",
bsr->sessid->sessid, rec->VolSessionId);
goto no_match;
}
*/
if (bsr->count && bsr->FileIndex) {
rec->bsr = bsr;
- Dmsg0(050, "Leave match_all 1\n");
+ Dmsg0(dbglevel, "Leave match_all 1\n");
return 1; /* this is a complete match */
}
Dmsg0(dbglevel, "fail on stream\n");
goto no_match;
}
- Dmsg0(050, "Leave match_all 1\n");
return 1;
no_match:
return match_all(bsr->next, rec, volrec, sessrec, bsr->done && done, jcr);
}
if (bsr->done && done) {
- Dmsg0(050, "Leave match all -1\n");
+ Dmsg0(dbglevel, "Leave match all -1\n");
return -1;
}
- Dmsg0(050, "Leave match all 0\n");
+ Dmsg0(dbglevel, "Leave match all 0\n");
return 0;
}
return 0; /* Volume must match */
}
if (strcmp(volume->VolumeName, volrec->VolumeName) == 0) {
- Dmsg1(050, "match_volume=%s\n", volrec->VolumeName);
+ Dmsg1(dbglevel, "match_volume=%s\n", volrec->VolumeName);
return 1;
}
if (volume->next) {
if (!(rec->state & REC_ISTAPE)) {
return 1; /* All File records OK for this match */
}
- Dmsg3(dbglevel, "match_volfile: sfile=%d efile=%d recfile=%d\n",
+ Dmsg3(dbglevel, "match_volfile: sfile=%u efile=%u recfile=%u\n",
volfile->sfile, volfile->efile, rec->File);
#endif
if (volfile->sfile <= rec->File && volfile->efile >= rec->File) {
if (volfile->done && done) {
bsr->done = true;
bsr->root->reposition = true;
- Dmsg2(dbglevel, "bsr done from volfile rec=%d volefile=%d\n",
+ Dmsg2(dbglevel, "bsr done from volfile rec=%u volefile=%u\n",
rec->File, volfile->efile);
}
return 0;
}
-static int match_volblock(BSR *bsr, BSR_VOLBLOCK *volblock, DEV_RECORD *rec, bool done)
+static int match_voladdr(BSR *bsr, BSR_VOLADDR *voladdr, DEV_RECORD *rec, bool done)
{
- /*
- * Currently block matching does not work correctly for disk
- * files in all cases, so it is "turned off" by the following
- * return statement.
- */
- return 1;
-
-
- if (!volblock) {
+ if (!voladdr) {
return 1; /* no specification matches all */
}
+
+#ifdef xxx
+
/* For the moment, these tests work only with disk. */
if (rec->state & REC_ISTAPE) {
- return 1; /* All File records OK for this match */
+ uint32_t sFile = (voladdr->saddr)>>32;
+ uint32_t eFile = (voladdr->eaddr)>>32;
+ if (sFile <= rec->File && eFile >= rec->File) {
+ return 1;
+ }
}
-// Dmsg3(dbglevel, "match_volblock: sblock=%d eblock=%d recblock=%d\n",
-// volblock->sblock, volblock->eblock, rec->Block);
- if (volblock->sblock <= rec->Block && volblock->eblock >= rec->Block) {
+
+#endif
+
+ uint64_t addr = get_record_address(rec);
+ Dmsg6(dbglevel, "match_voladdr: saddr=%llu eaddr=%llu recaddr=%llu sfile=%u efile=%u recfile=%u\n",
+ voladdr->saddr, voladdr->eaddr, addr, voladdr->saddr>>32, voladdr->eaddr>>32, addr>>32);
+
+ if (voladdr->saddr <= addr && voladdr->eaddr >= addr) {
return 1;
}
/* Once we get past last eblock, we are done */
- if (rec->Block > volblock->eblock) {
- volblock->done = true; /* set local done */
+ if (addr > voladdr->eaddr) {
+ voladdr->done = true; /* set local done */
}
- if (volblock->next) {
- return match_volblock(bsr, volblock->next, rec, volblock->done && done);
+ if (voladdr->next) {
+ return match_voladdr(bsr, voladdr->next, rec, voladdr->done && done);
}
-/*
- * This is turned off because I do not believe that we can mark
- * the bsr as done at this level.
- */
-#ifdef xxx
/* If we are done and all prior matches are done, this bsr is finished */
- if (volblock->done && done) {
+ if (voladdr->done && done) {
bsr->done = true;
bsr->root->reposition = true;
- Dmsg2(dbglevel, "bsr done from volblock rec=%d voleblock=%d\n",
- rec->Block, volblock->eblock);
+ Dmsg2(dbglevel, "bsr done from voladdr rec=%llu voleaddr=%llu\n",
+ addr, voladdr->eaddr);
}
-#endif
return 0;
}
return 0;
}
+/*
+ * Note, we cannot mark bsr done based on session id because we may
+ * have interleaved records, and there may be more of what we want
+ * later.
+ */
static int match_sessid(BSR *bsr, BSR_SESSID *sessid, DEV_RECORD *rec)
{
if (!sessid) {
}
return 0;
}
+
+uint64_t get_bsr_start_addr(BSR *bsr, uint32_t *file, uint32_t *block)
+{
+ uint64_t bsr_addr = 0;
+ uint32_t sfile = 0, sblock = 0;
+
+ if (bsr) {
+ if (bsr->voladdr) {
+ bsr_addr = bsr->voladdr->saddr;
+ sfile = bsr_addr>>32;
+ sblock = (uint32_t)bsr_addr;
+
+ } else if (bsr->volfile && bsr->volblock) {
+ bsr_addr = (((uint64_t)bsr->volfile->sfile)<<32)|bsr->volblock->sblock;
+ sfile = bsr->volfile->sfile;
+ sblock = bsr->volblock->sblock;
+ }
+ }
+
+ if (file && block) {
+ *file = sfile;
+ *block = sblock;
+ }
+
+ return bsr_addr;
+}
projects / bacula / bacula / blobdiff