* 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
#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 *ds;
BSOCK *fd_sock = jcr->file_bsock;
int ok = TRUE;
+ int done = FALSE;
DEVICE *dev;
DEV_RECORD *rec;
DEV_BLOCK *block;
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
}
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; ) {
+ for ( ;ok && !done; ) {
if (job_cancelled(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(dev, block)) {
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;
}
- continue;
+ 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");
* get all the data.
*/
+ if (rec->FileIndex == EOM_LABEL) { /* end of tape? */
+ Dmsg0(40, "Get EOM LABEL\n");
+ rec->remainder = 0;
+ break; /* yes, get out */
+ }
+
/* 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;
- }
- Dmsg5(10, "%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");
- rec->remainder = 0;
- break; /* yes, get out */
- }
- rec->remainder = 0;
- continue; /* ignore other labels */
+ 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)) {
+ 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;
* 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;
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");
+ 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);
+}
projects / bacula / bacula / blobdiff