X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fstored%2Fread.c;h=b6f5525c07eea1215cb05fa3bea84c97aad21107;hb=7503a438c87931cf1748bd0fda3bb932e2af3346;hp=d956494a103b38e51941b6fbc879b0966358bac0;hpb=14688fe152ffecdc82336decd897a0b5e56bb670;p=bacula%2Fbacula

diff --git a/bacula/src/stored/read.c b/bacula/src/stored/read.c
index d956494a10..b6f5525c07 100644
--- a/bacula/src/stored/read.c
+++ b/bacula/src/stored/read.c
@@ -1,11 +1,12 @@
 /*
  * Read code for Storage daemon
+ *
  *     Kern Sibbald, November MM
  *
  *   Version $Id$
  */
 /*
-   Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker
+   Copyright (C) 2000-2005 Kern Sibbald
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -28,218 +29,109 @@
 #include "stored.h"
 
 /* Forward referenced subroutines */
-
-/* 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) */
+static bool record_cb(DCR *dcr, DEV_RECORD *rec);
 
 
 /* Responses sent to the File daemon */
 static char OK_data[]    = "3000 OK data\n";
+static char FD_error[]   = "3000 error\n";
 static char rec_header[] = "rechdr %ld %ld %ld %ld %ld";
 
-/* 
+/*
  *  Read Data and send to File Daemon
- *   Returns: 0 on failure
- *	      1 on success
+ *   Returns: false on failure
+ *	      true  on success
  */
-int do_read_data(JCR *jcr) 
+bool do_read_data(JCR *jcr)
 {
-   BSOCK *ds;
-   BSOCK *fd_sock = jcr->file_bsock;
-   int ok = TRUE;
-   DEVICE *dev;
-   DEV_RECORD rec;
-   DEV_BLOCK *block;
-   char *hdr, *p;
-
-   
-   Dmsg0(20, "Start read data.\n");
+   BSOCK *fd = jcr->file_bsock;
+   bool ok = true;
+   DCR *dcr = jcr->dcr;
 
-   dev = jcr->device->dev;
+   Dmsg0(20, "Start read data.\n");
 
-   /* Tell File daemon we will send data */
-   bnet_fsend(fd_sock, OK_data);
-   Dmsg1(10, "bstored>filed: %s\n", fd_sock->msg);
+   if (!bnet_set_buffer_size(fd, dcr->device->max_network_buffer_size, BNET_SETBUF_WRITE)) {
+      return false;
+   }
 
-   ds = fd_sock;
 
-   if (!bnet_set_buffer_size(ds, MAX_NETWORK_BUFFER_SIZE, BNET_SETBUF_READ)) {
-      return 0;
+   create_vol_list(jcr);
+   if (jcr->NumVolumes == 0) {
+      Jmsg(jcr, M_FATAL, 0, _("No Volume names found for restore.\n"));
+      free_vol_list(jcr);
+      bnet_fsend(fd, FD_error);
+      return false;
    }
 
+   Dmsg2(200, "Found %d volumes names to restore. First=%s\n", jcr->NumVolumes,
+      jcr->VolList->VolumeName);
+
+   /* Ready device for reading */
+   if (!acquire_device_for_read(jcr, dcr->dev)) {
+      free_vol_list(jcr);
+      bnet_fsend(fd, FD_error);
+      return false;
+   }
 
-   Dmsg1(20, "Begin read device=%s\n", dev_name(dev));
+   /* Tell File daemon we will send data */
+   bnet_fsend(fd, OK_data);
+   ok = read_records(dcr, record_cb, mount_next_read_volume);
 
-   block = new_block(dev);
+   /* Send end of data to FD */
+   bnet_sig(fd, BNET_EOD);
 
-   /* Find out if we were passed multiple volumes */
-   jcr->NumVolumes = 1;
-   jcr->CurVolume = 1;
-   /* Scan through VolumeNames terminating them and counting them */
-   for (p = jcr->VolumeName; p && *p; ) {
-      p = strchr(p, '|');             /* volume name separator */
-      if (p) {
-	 *p++ = 0;		      /* Terminate name */
-	 jcr->NumVolumes++;
-      }
+   if (!release_device(dcr)) {
+      ok = false;
    }
 
-   Dmsg1(20, "Found %d volumes names to restore.\n", jcr->NumVolumes);
+   free_vol_list(jcr);
+   Dmsg0(30, "Done reading.\n");
+   return ok;
+}
 
-   /* 
-    * Ready device for reading, and read records
-    */
-   if (!acquire_device_for_read(jcr, dev, block)) {
-      free_block(block);
-      return 0;
-   }
+/*
+ * Called here for each record from read_records()
+ *  Returns: true if OK
+ *	     false if error
+ */
+static bool record_cb(DCR *dcr, DEV_RECORD *rec)
+{
+   JCR *jcr = dcr->jcr;
+   BSOCK *fd = jcr->file_bsock;
+   bool ok = true;
+   POOLMEM *save_msg;
 
-   memset(&rec, 0, sizeof(rec));
-   rec.data = ds->msg;		      /* use socket message buffer */
-   hdr = (char *) get_pool_memory(PM_MESSAGE);
-
-   /*
-    * ****FIXME**** enhance this to look for 
-    *		    more things than just a session.
-    */
-   for ( ;ok; ) {
-      DEV_RECORD *record;	      /* for reading label of multi-volumes */
-      SESSION_LABEL sessrec;	       /* session record */
-
-      if (job_cancelled(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);
-	 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);
-	    if (jcr->NumVolumes > 1 && jcr->CurVolume < jcr->NumVolumes) {
-	       close_dev(dev);
-	       for (p=jcr->VolumeName; *p++; ) /* skip to next volume name */
-		  { }
-	       jcr->CurVolume++;
-               Dmsg1(20, "There is another volume %s.\n", p);
-	       strcpy(jcr->VolumeName, p);
-	       dev->state &= ~ST_READ; 
-	       if (!acquire_device_for_read(jcr, dev, block)) {
-                  Emsg2(M_ERROR, 0, "Cannot open Dev=%s, Vol=%s\n", dev_name(dev), p);
-		  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;
-	    }
-            Dmsg0(90, "End of Device reached.\n");
-	    break;		      /* End of Tape */
-	 }
-	 if (dev->state & ST_EOF) {
-            Dmsg0(90, "Got End of File. Trying again ...\n");
-	    continue;		      /* End of File */
-	 }
-
-         Emsg2(M_ABORT, 0, "Read error on Record Header %s ERR=%s\n", dev_name(dev), strerror(errno));
-      }
-
-      /* Some sort of label? */ 
-      if (rec.FileIndex < 0) {
-	 char *rtype;
-	 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);
-	 }
-
-         Dmsg1(40, "Got label = %d\n", rec.FileIndex);
-	 if (rec.FileIndex == EOM_LABEL) { /* end of tape? */
-            Dmsg0(40, "Get EOM LABEL\n");
-	    break;			   /* yes, get out */
-	 }
-	 continue;			   /* ignore other labels */
-      }
-
-      /* ****FIXME***** make sure we REALLY have a session record */
-      if (jcr->bsr && !match_bsr(jcr->bsr, &rec, &dev->VolHdr, &sessrec)) {
-         Dmsg0(50, "BSR rejected record\n");
-	 continue;
-      }
-
-      if (rec.VolSessionId != jcr->read_VolSessionId ||
-	  rec.VolSessionTime != jcr->read_VolSessionTime) {
-         Dmsg0(50, "Ignore record ids not equal\n");
-	 continue;		      /* ignore */
-      }
-       
-      /* 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 */
-
-      /* 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;
-      }
+   if (rec->FileIndex < 0) {
+      return true;
    }
-   /* Send end of data to FD */
-   bnet_sig(ds, BNET_EOF);
+   Dmsg5(100, "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);
+
+   /* Send record header to File daemon */
+   if (!bnet_fsend(fd, rec_header, rec->VolSessionId, rec->VolSessionTime,
+	  rec->FileIndex, rec->Stream, rec->data_len)) {
+      Dmsg1(30, ">filed: Error Hdr=%s\n", fd->msg);
+      Jmsg1(jcr, M_FATAL, 0, _("Error sending to File daemon. ERR=%s\n"),
+	 bnet_strerror(fd));
+      return false;
+   } else {
+      Dmsg1(31, ">filed: Hdr=%s\n", fd->msg);
+   }
+
 
-   if (!release_device(jcr, dev, block)) {
-      ok = FALSE;
+   /* Send data record to File daemon */
+   save_msg = fd->msg;		/* save fd message pointer */
+   fd->msg = rec->data; 	/* pass data directly to bnet_send */
+   fd->msglen = rec->data_len;
+   Dmsg1(31, ">filed: send %d bytes data.\n", fd->msglen);
+   if (!bnet_send(fd)) {
+      Pmsg1(000, "Error sending to FD. ERR=%s\n", bnet_strerror(fd));
+      Jmsg1(jcr, M_FATAL, 0, _("Error sending to File daemon. ERR=%s\n"),
+	 bnet_strerror(fd));
+
+      ok = false;
    }
-   free_pool_memory(hdr);
-   free_block(block);
-   Dmsg0(30, "Done reading.\n");
-   return ok ? 1 : 0;
+   fd->msg = save_msg;		      /* restore fd message pointer */
+   return ok;
 }