X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fstored%2Fread_record.c;h=8cd7b4f0b56e1789a0b92c64372dfeeb318eeb9a;hb=5c358307600ad7cd6983b8773f8d7dc1e7346c56;hp=4cf362002e5510895e9130c254209c9d48404ed4;hpb=c37638750b04e222c9436d70c55d28193c58a86f;p=bacula%2Fbacula

diff --git a/bacula/src/stored/read_record.c b/bacula/src/stored/read_record.c
index 4cf362002e..8cd7b4f0b5 100644
--- a/bacula/src/stored/read_record.c
+++ b/bacula/src/stored/read_record.c
@@ -1,29 +1,14 @@
-/*
- *
- *  This routine provides a routine that will handle all
- *    the gory little details of reading a record from a Bacula
- *    archive. It uses a callback to pass you each record in turn,
- *    as well as a callback for mounting the next tape.  It takes
- *    care of reading blocks, applying the bsr, ...
- *    Note, this routine is really the heart of the restore routines,
- *    and we are *really* bit pushing here so be careful about making
- *    any modifications.
- *
- *    Kern E. Sibbald, August MMII
- *
- *   Version $Id$
- */
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2002-2006 Free Software Foundation Europe e.V.
+   Copyright (C) 2002-2008 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.
+   License as published by the Free Software Foundation and included
+   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
@@ -40,6 +25,21 @@
    (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
    Switzerland, email:ftf@fsfeurope.org.
 */
+/*
+ *
+ *  This routine provides a routine that will handle all
+ *    the gory little details of reading a record from a Bacula
+ *    archive. It uses a callback to pass you each record in turn,
+ *    as well as a callback for mounting the next tape.  It takes
+ *    care of reading blocks, applying the bsr, ...
+ *    Note, this routine is really the heart of the restore routines,
+ *    and we are *really* bit pushing here so be careful about making
+ *    any modifications.
+ *
+ *    Kern E. Sibbald, August MMII
+ *
+ *   Version $Id$
+ */
 
 #include "bacula.h"
 #include "stored.h"
@@ -82,6 +82,7 @@ bool read_records(DCR *dcr,
             DEV_RECORD *trec = new_record();
             Jmsg(jcr, M_INFO, 0, _("End of Volume at file %u on device %s, Volume \"%s\"\n"),
                  dev->file, dev->print_name(), dcr->VolumeName);
+            volume_unused(dcr);       /* mark volume unused */
             if (!mount_cb(dcr)) {
                Jmsg(jcr, M_INFO, 0, _("End of all volumes.\n"));
                ok = false;            /* Stop everything */
@@ -103,16 +104,17 @@ bool read_records(DCR *dcr,
             jcr->mount_next_volume = false;
             /*  
              * The Device can change at the end of a tape, so refresh it
-             *   from the dcr.
+             *   and the block from the dcr.
              */
             dev = dcr->dev;
+            block = dcr->block;
             /*
              * We just have a new tape up, now read the label (first record)
              *  and pass it off to the callback routine, then continue
              *  most likely reading the previous record.
              */
             read_block_from_device(dcr, NO_BLOCK_NUMBER_CHECK);
-            read_record_from_block(block, trec);
+            read_record_from_block(dcr, block, trec);
             handle_session_record(dev, trec, &sessrec);
             ok = record_cb(dcr, trec);
             free_record(trec);
@@ -145,7 +147,7 @@ bool read_records(DCR *dcr,
             display_tape_error_status(jcr, dev);
             if (forge_on || jcr->ignore_label_errors) {
                dev->fsr(1);       /* try skipping bad record */
-               Pmsg0(000, _("Did fsr\n"));
+               Pmsg0(000, _("Did fsr in attemp to skip bad record.\n"));
                continue;              /* try to continue */
             }
             ok = false;               /* stop everything */
@@ -188,7 +190,7 @@ bool read_records(DCR *dcr,
       rec->state = 0;
       Dmsg1(dbglvl, "Block %s empty\n", is_block_empty(rec)?"is":"NOT");
       for (rec->state=0; ok && !is_block_empty(rec); ) {
-         if (!read_record_from_block(block, rec)) {
+         if (!read_record_from_block(dcr, block, rec)) {
             Dmsg3(400, "!read-break. state=%s blk=%d rem=%d\n", rec_state_to_str(rec),
                   block->BlockNumber, rec->remainder);
             break;
@@ -226,11 +228,13 @@ bool read_records(DCR *dcr,
              *  he wants to know if they matched the bsr, then he must
              *  check the match_stat in the record */
             ok = record_cb(dcr, rec);
+#ifdef xxx
             /*
              * If this is the end of the Session (EOS) for this record
              *  we can remove the record.  Note, there is a separate
              *  record to read each session. If a new session is seen
              *  a new record will be created at approx line 157 above.
+             * However, it seg faults in the for line at lineno 196.
              */
             if (rec->FileIndex == EOS_LABEL) {
                Dmsg2(dbglvl, "Remove EOS rec. SI=%d ST=%d\n", rec->VolSessionId,
@@ -238,6 +242,7 @@ bool read_records(DCR *dcr,
                recs->remove(rec);
                free_record(rec);
             }
+#endif
             continue;
          } /* end if label record */
 
@@ -275,7 +280,7 @@ bool read_records(DCR *dcr,
          /*
           * If we have a digest stream, we check to see if we have 
           *  finished the current bsr, and if so, repositioning will
-          *  be truned on.
+          *  be turned on.
           */
          if (crypto_digest_stream_type(rec->Stream) != CRYPTO_DIGEST_NONE) {
             Dmsg3(dbglvl, "Have digest FI=%u before bsr check pos %u:%u\n", rec->FileIndex,
@@ -328,12 +333,21 @@ static bool try_repositioning(JCR *jcr, DEV_RECORD *rec, DCR *dcr)
       return true;
    }
    if (bsr) {
+      /*
+       * ***FIXME*** gross kludge to make disk seeking work.  Remove
+       *   when find_next_bsr() is fixed not to return a bsr already
+       *   completed.
+       */
+      if (dev->file > bsr->volfile->sfile ||             
+         (dev->file == bsr->volfile->sfile && dev->block_num > bsr->volblock->sblock)) {
+         return false;
+      }
       if (verbose) {
          Jmsg(jcr, M_INFO, 0, _("Reposition from (file:block) %u:%u to %u:%u\n"),
             dev->file, dev->block_num, bsr->volfile->sfile,
             bsr->volblock->sblock);
       }
-      Dmsg4(dbglvl, "Try_Reposition from (file:block) %u:%u to %u:%u\n",
+      Dmsg4(10, "Try_Reposition from (file:block) %u:%u to %u:%u\n",
             dev->file, dev->block_num, bsr->volfile->sfile,
             bsr->volblock->sblock);
       dev->reposition(dcr, bsr->volfile->sfile, bsr->volblock->sblock);
@@ -357,9 +371,8 @@ static BSR *position_to_first_file(JCR *jcr, DCR *dcr)
       jcr->bsr->reposition = true;    /* force repositioning */
       bsr = find_next_bsr(jcr->bsr, dev);
       if (bsr && (bsr->volfile->sfile != 0 || bsr->volblock->sblock != 0)) {
-         Jmsg(jcr, M_INFO, 0, _("Forward spacing to file:block %u:%u.\n"),
-            bsr->volfile->sfile, bsr->volblock->sblock);
-         Dmsg2(dbglvl, "Forward spacing to file:block %u:%u.\n",
+         Jmsg(jcr, M_INFO, 0, _("Forward spacing Volume \"%s\" to file:block %u:%u.\n"),
+            dev->VolHdr.VolumeName,
             bsr->volfile->sfile, bsr->volblock->sblock);
          dev->reposition(dcr, bsr->volfile->sfile, bsr->volblock->sblock);
       }