Add V: to bextract and bscan

[bacula/bacula] / bacula / src / stored / read.c

diff --git a/bacula/src/stored/read.c b/bacula/src/stored/read.c
index d59f5418f710e9aa039df1b7b02f5133cf993a4a..b47362e48a6ff8d97466ca71de119809fea4f5c9 100644 (file)
--- a/bacula/src/stored/read.c
+++ b/bacula/src/stored/read.c
@@ -31,20 +31,11 @@
 /* Forward referenced subroutines */
 static void get_session_record(DEVICE *dev, DEV_RECORD *rec, SESSION_LABEL *sessrec);
 
-/* Variables used by Child process */
-/* Global statistics */
-/* Note, these probably should be in shared memory so that 
- * they are truly global for all processes
- */
-extern struct s_shm *shm;            /* shared memory structure */
-extern int  FiledDataChan;           /* File daemon data channel (port) */
-
 
 /* Responses sent to the File daemon */
 static char OK_data[]    = "3000 OK data\n";
 static char rec_header[] = "rechdr %ld %ld %ld %ld %ld";
 
-
 /* 
  *  Read Data and send to File Daemon
  *   Returns: 0 on failure
@@ -61,6 +52,7 @@ int do_read_data(JCR *jcr)
    DEV_BLOCK *block;
    POOLMEM *hdr; 
    SESSION_LABEL sessrec;             /* session record */
+   uint32_t BlockNumber = 0;
    
    Dmsg0(20, "Start read data.\n");
 
@@ -113,7 +105,7 @@ int do_read_data(JCR *jcr)
     *  Read records, apply BSR filtering, and return any that are 
     *   matched.
     */
-   for ( ;ok && !done; ) {
+   for ( ; ok && !done; ) {
       if (job_canceled(jcr)) {
         ok = FALSE;
         break;
@@ -121,28 +113,42 @@ int do_read_data(JCR *jcr)
       /* Read Record */
       Dmsg1(500, "Main read_record. rem=%d\n", rec->remainder);
 
-      if (block_is_empty(block) && !read_block_from_device(dev, block)) {
+      if (block_is_empty(block) && !read_block_from_device(jcr, dev, block, CHECK_BLOCK_NUMBERS)) {
          Dmsg1(500, "Main read record failed. rem=%d\n", rec->remainder);
         if (dev->state & ST_EOT) {
            DEV_RECORD *record;
            if (!mount_next_read_volume(jcr, dev, block)) {
               break;
            }
+           /* Read and discard Volume Label */
            record = new_record();
-           read_block_from_device(dev, block);
+           read_block_from_device(jcr, dev, block, NO_BLOCK_NUMBER_CHECK);
            read_record_from_block(block, record);
            get_session_record(dev, record, &sessrec);
            free_record(record);
-        }
-        if (dev->state & ST_EOF) {
+           /* Now, continue to read the records on this volume */
+
+        } else if (dev->state & ST_EOF) {
             Dmsg0(90, "Got End of File. Trying again ...\n");
            continue;                 /* End of File */
-        }
-        if (dev->state & ST_SHORT) {
+        } else if (dev->state & ST_SHORT) {
            continue;
+        } else {
+           /* I/O error -- or non-standard end of tape */
+            Dmsg0(000, "I/O error, bailing out.\n");
+           ok = FALSE;
+           break;
         }
       }
 
+      if (!block_is_empty(block) && !match_bsr_block(jcr->bsr, block)) {
+         Dmsg5(100, "reject Blk=%u blen=%u bVer=%d SessId=%u SessTim=%u\n",
+           block->BlockNumber, block->block_len, block->BlockVer,
+           block->VolSessionId, block->VolSessionTime);
+        empty_block(block);          /* force read next block */
+        continue;
+      }
+
       for (rec->state=0; !is_block_empty(rec); ) {
 
         if (!read_record_from_block(block, rec)) {
@@ -189,13 +195,24 @@ int do_read_data(JCR *jcr)
            }
         }
 
+        if (block->block_read) {
+           if (BlockNumber != block->BlockNumber) {
+               Jmsg(jcr, M_ERROR, 0, _("Invalid block number. Expected %u, got %u\n"),
+                   BlockNumber, block->BlockNumber);
+           }
+           BlockNumber = block->BlockNumber + 1;
+           block->block_read = false;
+        }
+
         if (is_partial_record(rec)) {
            break;                    /* Go read full record */
         }
          
-        /* Generate Header parameters and send to File daemon
+        /*
+          * We "finally" have a full record here. Now
+         *   generate Header parameters and send to File daemon
          * Note, we build header in hdr buffer to avoid wiping
-         * out the data record
+         *   out the data record
          */
         ds->msg = hdr;
          Dmsg5(400, "Send to FD: SessId=%u SessTim=%u FI=%d Strm=%d, len=%d\n",
@@ -206,6 +223,8 @@ int do_read_data(JCR *jcr)
             Dmsg1(30, ">filed: Error Hdr=%s\n", ds->msg);
            hdr = ds->msg;
            ds->msg = rec->data;
+            Jmsg1(jcr, M_FATAL, 0, _("Error sending to File daemon. ERR=%s\n"),
+              bnet_strerror(ds));
            ok = FALSE;
            break;
         } else {
@@ -227,8 +246,8 @@ int do_read_data(JCR *jcr)
            ok = FALSE;
            break;
         }
-      }
-   }
+      } /* end for loop reading records */
+   } /* end for loop reading blocks */
    /* Send end of data to FD */
    bnet_sig(ds, BNET_EOD);
 
@@ -249,26 +268,26 @@ static void get_session_record(DEVICE *dev, DEV_RECORD *rec, SESSION_LABEL *sess
    char *rtype;
    memset(sessrec, 0, sizeof(sessrec));
    switch (rec->FileIndex) {
-      case PRE_LABEL:
-         rtype = "Fresh Volume Label";   
-        break;
-      case VOL_LABEL:
-         rtype = "Volume Label";
-        unser_volume_label(dev, rec);
-        break;
-      case SOS_LABEL:
-         rtype = "Begin Session";
-        unser_session_label(sessrec, rec);
-        break;
-      case EOS_LABEL:
-         rtype = "End Session";
-        break;
-      case EOM_LABEL:
-         rtype = "End of Media";
-        break;
-      default:
-         rtype = "Unknown";
-        break;
+   case PRE_LABEL:
+      rtype = "Fresh Volume Label";   
+      break;
+   case VOL_LABEL:
+      rtype = "Volume Label";
+      unser_volume_label(dev, rec);
+      break;
+   case SOS_LABEL:
+      rtype = "Begin Session";
+      unser_session_label(sessrec, rec);
+      break;
+   case EOS_LABEL:
+      rtype = "End Session";
+      break;
+   case EOM_LABEL:
+      rtype = "End of Media";
+      break;
+   default:
+      rtype = "Unknown";
+      break;
    }
    Dmsg5(10, "%s Record: VolSessionId=%d VolSessionTime=%d JobId=%d DataLen=%d\n",
         rtype, rec->VolSessionId, rec->VolSessionTime, rec->Stream, rec->data_len);