X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fstored%2Fmatch_bsr.c;h=89da956f0b7d76444c2561b380d3c7292b2cfb93;hb=7ec2fb16d7280faef2f4964aa5925a3a03dfb47d;hp=95fed69776de4b1a80d308b8937558f18cbe5ff1;hpb=d874e371fd8ce6573bb6bd723d1be179244c0f54;p=bacula%2Fbacula

diff --git a/bacula/src/stored/match_bsr.c b/bacula/src/stored/match_bsr.c
index 95fed69776..89da956f0b 100755
--- a/bacula/src/stored/match_bsr.c
+++ b/bacula/src/stored/match_bsr.c
@@ -8,7 +8,7 @@
  */
 
 /*
-   Copyright (C) 2000-2003 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
@@ -46,6 +46,8 @@ 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);
 static int match_block_sesstime(BSR *bsr, BSR_SESSTIME *sesstime, DEV_BLOCK *block);
 static int match_block_sessid(BSR *bsr, BSR_SESSID *sessid, DEV_BLOCK *block);
+static BSR *find_smallest_volfile(BSR *fbsr, BSR *bsr);
+
 
 /*********************************************************************
  *
@@ -75,10 +77,16 @@ int match_bsr_block(BSR *bsr, DEV_BLOCK *block)
       return 1; 		      /* cannot fast reject */
    }
 
-   if (match_block_sesstime(bsr, bsr->sesstime, block)) {
+   for ( ; bsr; bsr=bsr->next) {
+      if (!match_block_sesstime(bsr, bsr->sesstime, block)) {
+	 continue;
+      }
+      if (!match_block_sessid(bsr, bsr->sessid, block)) {
+	 continue;
+      }
       return 1;
    }
-   return match_block_sessid(bsr, bsr->sessid, block);
+   return 0;
 }
 
 static int match_block_sesstime(BSR *bsr, BSR_SESSTIME *sesstime, DEV_BLOCK *block)
@@ -114,22 +122,149 @@ static int match_block_sessid(BSR *bsr, BSR_SESSID *sessid, DEV_BLOCK *block)
  *
  *	Match Bootstrap records
  *	  returns  1 on match
- *	  returns  0 no match
+ *	  returns  0 no match and reposition is set if we should
+ *			reposition the tape
  *	 returns -1 no additional matches possible
  */
 int match_bsr(BSR *bsr, DEV_RECORD *rec, VOLUME_LABEL *volrec, SESSION_LABEL *sessrec)
 {
    int stat;
 
+   /*
+    * The bsr->reposition flag is set any time a bsr is done.
+    *	In this case, we can probably reposition the
+    *	tape to the next available bsr position.
+    */
    if (bsr) {
+      bsr->reposition = false;
       stat = match_all(bsr, rec, volrec, sessrec, true);
+      /* 
+       * Note, bsr->reposition is set by match_all when
+       *  a bsr is done. We turn it off if a match was
+       *  found or if we cannot use positioning
+       */
+      if (stat != 0 || !bsr->use_positioning) {
+	 bsr->reposition = false;
+      }
    } else {
-      stat = 0;
+      stat = 1; 		      /* no bsr => match all */
    }
-// Dmsg1(000, "BSR returning %d\n", stat);
    return stat;
 }
 
+/*
+ * Find the next bsr that applies to the current tape.
+ *   It is the one with the smallest VolFile position.
+ */
+BSR *find_next_bsr(BSR *root_bsr, DEVICE *dev)
+{
+   BSR *bsr;
+   BSR *found_bsr = NULL;
+
+   if (!root_bsr || !root_bsr->use_positioning || 
+       !root_bsr->reposition || !dev_is_tape(dev)) {
+      Dmsg2(100, "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);
+   root_bsr->mount_next_volume = false;
+   for (bsr=root_bsr; bsr; bsr=bsr->next) {
+      if (bsr->done || !match_volume(bsr, bsr->volume, &dev->VolHdr, 1)) {
+	 continue;
+      }
+      if (found_bsr == NULL) {
+	 found_bsr = bsr;
+      } else {
+	 found_bsr = find_smallest_volfile(found_bsr, bsr);
+      }
+   }
+   /*
+    * If we get to this point and found no bsr, it means
+    *  that any additional bsr's must apply to the next
+    *  tape, so set a flag.
+    */
+   if (found_bsr == NULL) {
+      root_bsr->mount_next_volume = true;
+   }
+   return found_bsr;
+}
+
+static BSR *find_smallest_volfile(BSR *found_bsr, BSR *bsr)
+{
+   BSR *return_bsr = found_bsr;
+   BSR_VOLFILE *vf;
+   BSR_VOLBLOCK *vb;
+   uint32_t found_bsr_sfile, bsr_sfile;
+   uint32_t found_bsr_sblock, bsr_sblock;
+
+   vf = found_bsr->volfile;
+   found_bsr_sfile = vf->sfile;
+   while ( (vf=vf->next) ) {
+      if (vf->sfile < found_bsr_sfile) {
+	 found_bsr_sfile = vf->sfile;
+      }
+   }
+   vf = bsr->volfile;
+   bsr_sfile = vf->sfile;
+   while ( (vf=vf->next) ) {
+      if (vf->sfile < bsr_sfile) {
+	 bsr_sfile = vf->sfile;
+      }
+   }
+   if (found_bsr_sfile > bsr_sfile) {
+      return_bsr = bsr;
+   } else if (found_bsr_sfile == bsr_sfile) {
+      /* Must check block */
+      vb = found_bsr->volblock;
+      found_bsr_sblock = vb->sblock;
+      while ( (vb=vb->next) ) {
+	 if (vb->sblock < found_bsr_sblock) {
+	    found_bsr_sblock = vb->sblock;
+	 }
+      }
+      vb = bsr->volblock;
+      bsr_sblock = vb->sblock;
+      while ( (vb=vb->next) ) {
+	 if (vb->sblock < bsr_sblock) {
+	    bsr_sblock = vb->sblock;
+	 }
+      }
+      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.
+ *  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)
+{
+   BSR *rbsr = rec->bsr;
+   Dmsg1(100, "match_set %d\n", rbsr != NULL);
+   if (!rbsr) {
+      return false;
+   }
+   rec->bsr = NULL;
+   rbsr->found++;
+   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",
+	 rbsr->count, rbsr->found);
+      return true;
+   }
+   return false;
+}
+
 /* 
  * Match all the components of current record
  *   returns  1 on match
@@ -142,31 +277,54 @@ static int match_all(BSR *bsr, DEV_RECORD *rec, VOLUME_LABEL *volrec,
    if (bsr->done) {
       goto no_match;
    }
-   if (bsr->count && bsr->count <= bsr->found) {
-      bsr->done = true;
-      goto no_match;
-   }
    if (!match_volume(bsr, bsr->volume, volrec, 1)) {
       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);
       goto no_match;
    }
    if (!match_sesstime(bsr, bsr->sesstime, rec, 1)) {
+      Dmsg2(100, "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",
+	 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);
       goto no_match;
    }
+   /*
+    * If a count was specified and we have a FileIndex, assume
+    *	it is a Bacula created bsr (or the equivalent). We
+    *	then save the bsr where the match occurred so that
+    *	after processing the record or records, we can update
+    *	the found count. I.e. rec->bsr points to the bsr that
+    *	satisfied the match.
+    */
+   if (bsr->count && bsr->FileIndex) {
+      rec->bsr = bsr;
+      return 1; 		      /* this is a complete match */
+   }
+
+   /*
+    * The selections below are not used by Bacula's
+    *   restore command, and don't work because of
+    *	the rec->bsr = bsr optimization above.
+    */
    if (!match_jobid(bsr, bsr->JobId, sessrec, 1)) {
       goto no_match;
+       
    }
    if (!match_job(bsr, bsr->job, sessrec, 1)) {
       goto no_match;
@@ -183,7 +341,6 @@ static int match_all(BSR *bsr, DEV_RECORD *rec, VOLUME_LABEL *volrec,
    if (!match_stream(bsr, bsr->stream, rec, 1)) {
       goto no_match;
    }
-   bsr->found++;
    return 1;
 
 no_match:
@@ -289,7 +446,7 @@ static int match_volfile(BSR *bsr, BSR_VOLFILE *volfile, DEV_RECORD *rec, bool d
    if (!(rec->state & REC_ISTAPE)) {
       return 1; 		      /* All File records OK for this match */
    }
-// Dmsg3(000, "match_volfile: sfile=%d efile=%d recfile=%d\n",
+// Dmsg3(100, "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;
@@ -305,6 +462,9 @@ static int match_volfile(BSR *bsr, BSR_VOLFILE *volfile, DEV_RECORD *rec, bool d
    /* If we are done and all prior matches are done, this bsr is finished */
    if (volfile->done && done) {
       bsr->done = true;
+      bsr->root->reposition = true;
+      Dmsg2(100, "bsr done from volfile rec=%d volefile=%d\n", 
+	 rec->File, volfile->efile);
    }
    return 0;
 }
@@ -339,6 +499,8 @@ static int match_sesstime(BSR *bsr, BSR_SESSTIME *sesstime, DEV_RECORD *rec, boo
    }
    if (sesstime->done && done) {
       bsr->done = true;
+      bsr->root->reposition = true;
+      Dmsg0(100, "bsr done from sesstime\n");
    }
    return 0;
 }
@@ -357,6 +519,10 @@ static int match_sessid(BSR *bsr, BSR_SESSID *sessid, DEV_RECORD *rec)
    return 0;
 }
 
+/*
+ * When reading the Volume, the Volume Findex (rec->FileIndex) always
+ *   are found in sequential order. Thus we can make optimizations.
+ */
 static int match_findex(BSR *bsr, BSR_FINDEX *findex, DEV_RECORD *rec, bool done)
 {
    if (!findex) {
@@ -373,6 +539,8 @@ static int match_findex(BSR *bsr, BSR_FINDEX *findex, DEV_RECORD *rec, bool done
    }
    if (findex->done && done) {
       bsr->done = true;
+      bsr->root->reposition = true;
+      Dmsg1(100, "bsr done from findex %d\n", rec->FileIndex);
    }
    return 0;
 }