* 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
/* 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
BSOCK *ds;
BSOCK *fd_sock = jcr->file_bsock;
int ok = TRUE;
+ int done = FALSE;
DEVICE *dev;
DEV_RECORD *rec;
DEV_BLOCK *block;
POOLMEM *hdr;
SESSION_LABEL sessrec; /* session record */
+ uint32_t BlockNumber = 0;
Dmsg0(20, "Start read data.\n");
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;
+ }
+
+ Dmsg2(200, "Found %d volumes names to restore. First=%s\n", jcr->NumVolumes,
+ jcr->VolList->VolumeName);
- Dmsg1(20, "Found %d volumes names to restore.\n", jcr->NumVolumes);
+ pm_strcpy(&jcr->VolumeName, jcr->VolList->VolumeName);
/*
* Ready device for reading, and read records
* Read records, apply BSR filtering, and return any that are
* matched.
*/
- for ( ;ok; ) {
- 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_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;
}
}
/* Match BSR against current record */
if (jcr->bsr) {
- if (!match_bsr(jcr->bsr, rec, &dev->VolHdr, &sessrec)) {
+ 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;
}
}
+ 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;
+ 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",
+ 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;
+ Jmsg1(jcr, M_FATAL, 0, _("Error sending to File daemon. ERR=%s\n"),
+ bnet_strerror(ds));
ok = FALSE;
break;
} else {
ok = FALSE;
break;
}
- }
- }
+ } /* end for loop reading records */
+ } /* end for loop reading blocks */
/* 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);
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);