#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 */
BSOCK *fd_sock = jcr->file_bsock;
int ok = TRUE;
DEVICE *dev;
- DEV_RECORD rec;
+ DEV_RECORD *rec;
DEV_BLOCK *block;
POOLMEM *hdr;
SESSION_LABEL sessrec; /* session record */
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);
/*
* matched.
*/
for ( ;ok; ) {
- DEV_RECORD *record; /* for reading label of multi-volumes */
-
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);
+ Dmsg1(500, "Main read_record. rem=%d\n", rec->remainder);
+
+ if (!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) {
+ if (!match_bsr(jcr->bsr, rec, &dev->VolHdr, &sessrec)) {
+ 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;
+ 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 */
}
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);
+}