]> git.sur5r.net Git - bacula/bacula/blobdiff - bacula/src/stored/read.c
Misc see kes-1.31 13May03
[bacula/bacula] / bacula / src / stored / read.c
index b39e23da15978e4aa99cd4b15218718c68bb1317..d59f5418f710e9aa039df1b7b02f5133cf993a4a 100644 (file)
@@ -6,7 +6,7 @@
  *   Version $Id$
  */
 /*
-   Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker
+   Copyright (C) 2000-2003 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
@@ -29,6 +29,7 @@
 #include "stored.h"
 
 /* Forward referenced subroutines */
+static void get_session_record(DEVICE *dev, DEV_RECORD *rec, SESSION_LABEL *sessrec);
 
 /* Variables used by Child process */
 /* Global statistics */
@@ -54,8 +55,9 @@ int do_read_data(JCR *jcr)
    BSOCK *ds;
    BSOCK *fd_sock = jcr->file_bsock;
    int ok = TRUE;
+   int done = FALSE;
    DEVICE *dev;
-   DEV_RECORD rec;
+   DEV_RECORD *rec;
    DEV_BLOCK *block;
    POOLMEM *hdr; 
    SESSION_LABEL sessrec;             /* session record */
@@ -81,8 +83,17 @@ int do_read_data(JCR *jcr)
    block = new_block(dev);
 
    create_vol_list(jcr);
+   if (jcr->NumVolumes == 0) {
+      Jmsg(jcr, M_FATAL, 0, _("No Volume names found for restore.\n"));
+      free_block(block);
+      free_vol_list(jcr);
+      return 0;
+   }
 
-   Dmsg1(20, "Found %d volumes names to restore.\n", jcr->NumVolumes);
+   Dmsg2(200, "Found %d volumes names to restore. First=%s\n", jcr->NumVolumes, 
+      jcr->VolList->VolumeName);
+
+   pm_strcpy(&jcr->VolumeName, jcr->VolList->VolumeName);
 
    /* 
     * Ready device for reading, and read records
@@ -93,158 +104,172 @@ int do_read_data(JCR *jcr)
       return 0;
    }
 
-   memset(&rec, 0, sizeof(rec));
-   rec.data = ds->msg;               /* use socket message buffer */
+   rec = new_record();
+   free_pool_memory(rec->data);
+   rec->data = ds->msg;               /* use socket message buffer */
    hdr = get_pool_memory(PM_MESSAGE);
 
    /*
     *  Read records, apply BSR filtering, and return any that are 
     *   matched.
     */
-   for ( ;ok; ) {
-      DEV_RECORD *record;            /* for reading label of multi-volumes */
-
-      if (job_cancelled(jcr)) {
+   for ( ;ok && !done; ) {
+      if (job_canceled(jcr)) {
         ok = FALSE;
         break;
       }
       /* Read Record */
-      Dmsg1(500, "Main read_record. rem=%d\n", rec.remainder);
-      if (!read_record(dev, block, &rec)) {
-         Dmsg1(500, "Main read record failed. rem=%d\n", rec.remainder);
+      Dmsg1(500, "Main read_record. rem=%d\n", rec->remainder);
+
+      if (block_is_empty(block) && !read_block_from_device(dev, block)) {
+         Dmsg1(500, "Main read record failed. rem=%d\n", rec->remainder);
         if (dev->state & ST_EOT) {
-           if (rec.remainder) {
-               Dmsg0(500, "Not end of record.\n");
-           }
-            Dmsg2(90, "NumVolumes=%d CurVolume=%d\n", jcr->NumVolumes, jcr->CurVolume);
-           /*
-            * End Of Tape -- mount next Volume (if another specified)
-            */
-           if (jcr->NumVolumes > 1 && jcr->CurVolume < jcr->NumVolumes) {
-              VOL_LIST *vol = jcr->VolList;
-              close_dev(dev);
-              jcr->CurVolume++;
-              for (int i=1; i<jcr->CurVolume; i++) {
-                 vol = vol->next;
-              }
-              strcpy(jcr->VolumeName, vol->VolumeName);
-               Dmsg1(000, "There is another volume %s.\n", jcr->VolumeName);
-              dev->state &= ~ST_READ; 
-              if (!acquire_device_for_read(jcr, dev, block)) {
-                  Jmsg(jcr, M_FATAL, 0, _("Cannot open Dev=%s, Vol=%s\n"), dev_name(dev), jcr->VolumeName);
-                 ok = FALSE;
-                 break;
-              }
-              record = new_record();
-               Dmsg1(500, "read record after new tape. rem=%d\n", record->remainder);
-              read_record(dev, block, record); /* read vol label */
-              dump_label_record(dev, record, 0);
-              free_record(record);
-              continue;
+           DEV_RECORD *record;
+           if (!mount_next_read_volume(jcr, dev, block)) {
+              break;
            }
-            Dmsg0(90, "End of Device reached.\n");
-           break;                    /* End of Tape */
+           record = new_record();
+           read_block_from_device(dev, block);
+           read_record_from_block(block, record);
+           get_session_record(dev, record, &sessrec);
+           free_record(record);
         }
         if (dev->state & ST_EOF) {
             Dmsg0(90, "Got End of File. Trying again ...\n");
            continue;                 /* End of File */
         }
-
-         Jmsg2(jcr, M_FATAL, 0, _("Read error on Record Header %s ERR=%s\n"), dev_name(dev), strerror(errno));
-        ok = FALSE;
-        break;
+        if (dev->state & ST_SHORT) {
+           continue;
+        }
       }
 
-      /* Some sort of label? */ 
-      if (rec.FileIndex < 0) {
-        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;
-        }
-        if (debug_level > 0) {
-            printf("%s Record: VolSessionId=%d VolSessionTime=%d JobId=%d DataLen=%d\n",
-              rtype, rec.VolSessionId, rec.VolSessionTime, rec.Stream, rec.data_len);
+      for (rec->state=0; !is_block_empty(rec); ) {
+
+        if (!read_record_from_block(block, rec)) {
+           break;
         }
+        /*
+         * At this point, we have at least a record header.
+         *  Now decide if we want this record or not, but remember
+         *  before accessing the record, we may need to read again to
+         *  get all the data.
+         */
 
-         Dmsg1(40, "Got label = %d\n", rec.FileIndex);
-        if (rec.FileIndex == EOM_LABEL) { /* end of tape? */
+        if (rec->FileIndex == EOM_LABEL) { /* end of tape? */
             Dmsg0(40, "Get EOM LABEL\n");
+           rec->remainder = 0;
            break;                         /* yes, get out */
         }
-        continue;                         /* ignore other labels */
-      } /* end if label record */
 
-      if (jcr->bsr) {
-        /* Match BSR against current record */
-        if (!match_bsr(jcr->bsr, &rec, &dev->VolHdr, &sessrec)) {
-            Dmsg0(50, "BSR rejected record\n");
+        /* Some sort of label? */ 
+        if (rec->FileIndex < 0) {
+           get_session_record(dev, rec, &sessrec);
            continue;
+        } /* end if label record */
+
+
+        /* Match BSR against current record */
+        if (jcr->bsr) {
+           int stat = match_bsr(jcr->bsr, rec, &dev->VolHdr, &sessrec);
+           if (stat == -1) {         /* no more possible matches */
+              done = TRUE;
+              break;
+           } else if (stat == 0) {   /* no match */
+               Dmsg0(50, "BSR rejected record\n");
+              rec->remainder = 0;
+              continue;
+           }
+        } else { 
+           /* Old way, deprecated */
+           if (rec->VolSessionId != jcr->read_VolSessionId ||
+               rec->VolSessionTime != jcr->read_VolSessionTime) {
+               Dmsg0(50, "Ignore record ids not equal\n");
+              rec->remainder = 0;
+              continue;                    /* ignore */
+           }
         }
-      } else { 
-        /* Old way, deprecated */
-        if (rec.VolSessionId != jcr->read_VolSessionId ||
-            rec.VolSessionTime != jcr->read_VolSessionTime) {
-            Dmsg0(50, "Ignore record ids not equal\n");
-           continue;                    /* ignore */
+
+        if (is_partial_record(rec)) {
+           break;                    /* Go read full record */
+        }
+         
+        /* Generate Header parameters and send to File daemon
+         * Note, we build header in hdr buffer to avoid wiping
+         * out the data record
+         */
+        ds->msg = hdr;
+         Dmsg5(400, "Send to FD: SessId=%u SessTim=%u FI=%d Strm=%d, len=%d\n",
+           rec->VolSessionId, rec->VolSessionTime, rec->FileIndex, rec->Stream,
+           rec->data_len);
+        if (!bnet_fsend(ds, rec_header, rec->VolSessionId, rec->VolSessionTime,
+               rec->FileIndex, rec->Stream, rec->data_len)) {
+            Dmsg1(30, ">filed: Error Hdr=%s\n", ds->msg);
+           hdr = ds->msg;
+           ds->msg = rec->data;
+           ok = FALSE;
+           break;
+        } else {
+            Dmsg1(30, ">filed: Hdr=%s\n", ds->msg);
         }
-      }
-       
-      /* Generate Header parameters and send to File daemon
-       * Note, we build header in hdr buffer to avoid wiping
-       * out the data record
-       */
-      ds->msg = hdr;
-      if (!bnet_fsend(ds, rec_header, rec.VolSessionId, rec.VolSessionTime,
-            rec.FileIndex, rec.Stream, rec.data_len)) {
-         Dmsg1(30, ">filed: Error Hdr=%s\n", ds->msg);
-        ds->msg = rec.data;
-        ok = FALSE;
-        break;
-      } else {
-         Dmsg1(30, ">filed: Hdr=%s\n", ds->msg);
-      }
 
-      ds->msg = rec.data;            /* restore data record address */
+        hdr = ds->msg;               /* restore hdr buffer */
+        ds->msg = rec->data;         /* restore data record address */
 
-      /* Send data record to File daemon */
-      ds->msglen = rec.data_len;
-      Dmsg1(40, ">filed: send %d bytes data.\n", ds->msglen);
-      if (!bnet_send(ds)) {
-         Dmsg0(0, "Error sending to FD\n");
-         Jmsg1(jcr, M_FATAL, 0, _("Error sending to File daemon. ERR=%s\n"),
-           bnet_strerror(ds));
-        ok = FALSE;
+        /* Send data record to File daemon */
+        ds->msglen = rec->data_len;
+         Dmsg1(40, ">filed: send %d bytes data.\n", ds->msglen);
+        if (!bnet_send(ds)) {
+            Pmsg1(000, "Error sending to FD. ERR=%s\n", bnet_strerror(ds));
+            Dmsg1(100, "Hdr=%s\n", hdr);
+            Dmsg1(100, "data=%s\n", ds->msg);
+            Jmsg1(jcr, M_FATAL, 0, _("Error sending to File daemon. ERR=%s\n"),
+              bnet_strerror(ds));
+           ok = FALSE;
+           break;
+        }
       }
    }
    /* Send end of data to FD */
    bnet_sig(ds, BNET_EOD);
 
-   if (!release_device(jcr, dev, block)) {
+   if (!release_device(jcr, dev)) {
       ok = FALSE;
    }
    free_pool_memory(hdr);
    free_block(block);
+   rec->data = NULL;                 /* previously released */
+   free_record(rec);
    free_vol_list(jcr);
    Dmsg0(30, "Done reading.\n");
    return ok ? 1 : 0;
 }
+
+static void get_session_record(DEVICE *dev, DEV_RECORD *rec, SESSION_LABEL *sessrec)
+{
+   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;
+   }
+   Dmsg5(10, "%s Record: VolSessionId=%d VolSessionTime=%d JobId=%d DataLen=%d\n",
+        rtype, rec->VolSessionId, rec->VolSessionTime, rec->Stream, rec->data_len);
+}