X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fstored%2Fread_record.c;h=dbf5a6c49c078e268400775de74676731e46ee6e;hb=6fc016ea3c4f5698462494319733199e2de9a9af;hp=ef8bc32ad36c65e53533eb9c2db472a82db6bf81;hpb=bf625de424e5a6c9af6b2ac2a2355448b6d34154;p=bacula%2Fbacula diff --git a/bacula/src/stored/read_record.c b/bacula/src/stored/read_record.c index ef8bc32ad3..dbf5a6c49c 100644 --- a/bacula/src/stored/read_record.c +++ b/bacula/src/stored/read_record.c @@ -5,13 +5,16 @@ * archive. It uses a callback to pass you each record in turn, * as well as a callback for mounting the next tape. It takes * care of reading blocks, applying the bsr, ... + * Note, this routine is really the heart of the restore routines, + * and we are *really* bit pushing here so be careful about making + * any modifications. * * Kern E. Sibbald, August MMII * * Version $Id$ */ /* - Copyright (C) 2000-2004 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 @@ -36,211 +39,208 @@ /* Forward referenced functions */ static void handle_session_record(DEVICE *dev, DEV_RECORD *rec, SESSION_LABEL *sessrec); static BSR *position_to_first_file(JCR *jcr, DEVICE *dev); -static int try_repositioning(JCR *jcr, DEV_RECORD *rec, DEVICE *dev); +static bool try_repositioning(JCR *jcr, DEV_RECORD *rec, DEVICE *dev); #ifdef DEBUG static char *rec_state_to_str(DEV_RECORD *rec); #endif bool read_records(DCR *dcr, - bool record_cb(JCR *jcr, DEVICE *dev, DEV_BLOCK *block, DEV_RECORD *rec), - bool mount_cb(JCR *jcr, DEVICE *dev, DEV_BLOCK *block)) + bool record_cb(DCR *dcr, DEV_RECORD *rec), + bool mount_cb(DCR *dcr)) { JCR *jcr = dcr->jcr; DEVICE *dev = dcr->dev; - DEV_BLOCK *block; + DEV_BLOCK *block = dcr->block; DEV_RECORD *rec = NULL; uint32_t record; bool ok = true; bool done = false; SESSION_LABEL sessrec; - dlist *recs; /* linked list of rec packets open */ + dlist *recs; /* linked list of rec packets open */ - block = new_block(dev); - recs = new dlist(rec, &rec->link); + recs = New(dlist(rec, &rec->link)); position_to_first_file(jcr, dev); + jcr->mount_next_volume = false; for ( ; ok && !done; ) { if (job_canceled(jcr)) { - ok = false; - break; + ok = false; + break; } - if (!read_block_from_device(dcr, block, CHECK_BLOCK_NUMBERS)) { - if (dev_state(dev, ST_EOT)) { - DEV_RECORD *trec = new_record(); - - Jmsg(jcr, M_INFO, 0, "End of Volume at file %u on device %s, Volume \"%s\"\n", - dev->file, dev_name(dev), jcr->VolumeName); - if (!mount_cb(jcr, dev, block)) { + if (!read_block_from_device(dcr, CHECK_BLOCK_NUMBERS)) { + if (dev->at_eot()) { + DEV_RECORD *trec = new_record(); + Jmsg(jcr, M_INFO, 0, "End of Volume at file %u on device %s, Volume \"%s\"\n", + dev->file, dev->print_name(), dcr->VolumeName); + if (!mount_cb(dcr)) { Jmsg(jcr, M_INFO, 0, "End of all volumes.\n"); - ok = false; - /* - * Create EOT Label so that Media record may - * be properly updated because this is the last - * tape. - */ - trec->FileIndex = EOT_LABEL; - trec->File = dev->file; - ok = record_cb(jcr, dev, block, trec); - free_record(trec); - break; - } - /* - * We just have a new tape up, now read the label (first record) - * and pass it off to the callback routine, then continue - * most likely reading the previous record. - */ - read_block_from_device(dcr, block, NO_BLOCK_NUMBER_CHECK); - read_record_from_block(block, trec); - handle_session_record(dev, trec, &sessrec); - ok = record_cb(jcr, dev, block, trec); - free_record(trec); - position_to_first_file(jcr, dev); - /* After reading label, we must read first data block */ - continue; + ok = false; /* Stop everything */ + /* + * Create EOT Label so that Media record may + * be properly updated because this is the last + * tape. + */ + trec->FileIndex = EOT_LABEL; + trec->File = dev->file; + ok = record_cb(dcr, trec); + free_record(trec); + if (jcr->mount_next_volume) { + jcr->mount_next_volume = false; + dev->clear_eot(); + } + break; + } + jcr->mount_next_volume = false; + /* + * We just have a new tape up, now read the label (first record) + * and pass it off to the callback routine, then continue + * most likely reading the previous record. + */ + read_block_from_device(dcr, NO_BLOCK_NUMBER_CHECK); + read_record_from_block(block, trec); + handle_session_record(dev, trec, &sessrec); + ok = record_cb(dcr, trec); + free_record(trec); + position_to_first_file(jcr, dev); + /* After reading label, we must read first data block */ + continue; - } else if (dev_state(dev, ST_EOF)) { - if (verbose) { - Jmsg(jcr, M_INFO, 0, "Got EOF at file %u on device %s, Volume \"%s\"\n", - dev->file, dev_name(dev), jcr->VolumeName); - } - Dmsg3(100, "Got EOF at file %u on device %s, Volume \"%s\"\n", - dev->file, dev_name(dev), jcr->VolumeName); - continue; - } else if (dev_state(dev, ST_SHORT)) { + } else if (dev->at_eof()) { + if (verbose) { + Jmsg(jcr, M_INFO, 0, "Got EOF at file %u on device %s, Volume \"%s\"\n", + dev->file, dev->print_name(), dcr->VolumeName); + } + Dmsg3(200, "Got EOF at file %u on device %s, Volume \"%s\"\n", + dev->file, dev->print_name(), dcr->VolumeName); + continue; + } else if (dev_state(dev, ST_SHORT)) { Jmsg1(jcr, M_ERROR, 0, "%s", dev->errmsg); - continue; - } else { - /* I/O error or strange end of tape */ - display_tape_error_status(jcr, dev); - if (forge_on || jcr->ignore_label_errors) { - fsr_dev(dev, 1); /* try skipping bad record */ - Dmsg0(000, "Did fsr\n"); - continue; /* try to continue */ - } - ok = false; - break; - } + continue; + } else { + /* I/O error or strange end of tape */ + display_tape_error_status(jcr, dev); + if (forge_on || jcr->ignore_label_errors) { + dev->fsr(1); /* try skipping bad record */ + Pmsg0(000, "Did fsr\n"); + continue; /* try to continue */ + } + ok = false; /* stop everything */ + break; + } } - Dmsg2(100, "New block at position=(file:block) %d:%d\n", dev->file, dev->block_num); + Dmsg2(300, "New block at position=(file:block) %u:%u\n", dev->file, dev->block_num); #ifdef if_and_when_FAST_BLOCK_REJECTION_is_working /* this does not stop when file/block are too big */ if (!match_bsr_block(jcr->bsr, block)) { - if (try_repositioning(jcr, rec, dev)) { - break; /* get next volume */ - } - continue; /* skip this record */ + if (try_repositioning(jcr, rec, dev)) { + break; /* get next volume */ + } + continue; /* skip this record */ } #endif /* * Get a new record for each Job as defined by - * VolSessionId and VolSessionTime + * VolSessionId and VolSessionTime */ bool found = false; foreach_dlist(rec, recs) { - if (rec->VolSessionId == block->VolSessionId && - rec->VolSessionTime == block->VolSessionTime) { - found = true; - break; - } + if (rec->VolSessionId == block->VolSessionId && + rec->VolSessionTime == block->VolSessionTime) { + found = true; + break; + } } if (!found) { - rec = new_record(); - recs->prepend(rec); - Dmsg2(100, "New record for SI=%d ST=%d\n", - block->VolSessionId, block->VolSessionTime); - } else { -#ifdef xxx - if (rec->Block != 0 && (rec->Block+1) != block->BlockNumber) { - Jmsg(jcr, M_ERROR, 0, _("Invalid block number. Expected %u, got %u\n"), - rec->Block+1, block->BlockNumber); - } -#endif + rec = new_record(); + recs->prepend(rec); + Dmsg2(300, "New record for SI=%d ST=%d\n", + block->VolSessionId, block->VolSessionTime); } - Dmsg3(100, "After mount next vol. stat=%s blk=%d rem=%d\n", rec_state_to_str(rec), - block->BlockNumber, rec->remainder); + Dmsg3(300, "After mount next vol. stat=%s blk=%d rem=%d\n", rec_state_to_str(rec), + block->BlockNumber, rec->remainder); record = 0; rec->state = 0; - Dmsg1(100, "Block empty %d\n", is_block_empty(rec)); + Dmsg1(300, "Block empty %d\n", is_block_empty(rec)); for (rec->state=0; !is_block_empty(rec); ) { - if (!read_record_from_block(block, rec)) { - Dmsg3(100, "!read-break. state=%s blk=%d rem=%d\n", rec_state_to_str(rec), - block->BlockNumber, rec->remainder); - break; - } - Dmsg5(100, "read-OK. state=%s blk=%d rem=%d file:block=%d:%d\n", - rec_state_to_str(rec), block->BlockNumber, rec->remainder, - dev->file, dev->block_num); - /* - * 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. - */ - record++; - Dmsg6(100, "recno=%d state=%s blk=%d SI=%d ST=%d FI=%d\n", record, - rec_state_to_str(rec), block->BlockNumber, - rec->VolSessionId, rec->VolSessionTime, rec->FileIndex); + if (!read_record_from_block(block, rec)) { + Dmsg3(400, "!read-break. state=%s blk=%d rem=%d\n", rec_state_to_str(rec), + block->BlockNumber, rec->remainder); + break; + } + Dmsg5(300, "read-OK. state=%s blk=%d rem=%d file:block=%u:%u\n", + rec_state_to_str(rec), block->BlockNumber, rec->remainder, + dev->file, dev->block_num); + /* + * 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. + */ + record++; + Dmsg6(300, "recno=%d state=%s blk=%d SI=%d ST=%d FI=%d\n", record, + rec_state_to_str(rec), block->BlockNumber, + rec->VolSessionId, rec->VolSessionTime, rec->FileIndex); - if (rec->FileIndex == EOM_LABEL) { /* end of tape? */ + if (rec->FileIndex == EOM_LABEL) { /* end of tape? */ Dmsg0(40, "Get EOM LABEL\n"); - break; /* yes, get out */ - } + break; /* yes, get out */ + } - /* Some sort of label? */ - if (rec->FileIndex < 0) { - handle_session_record(dev, rec, &sessrec); - ok = record_cb(jcr, dev, block, rec); - if (rec->FileIndex == EOS_LABEL) { - Dmsg2(100, "Remove rec. SI=%d ST=%d\n", rec->VolSessionId, - rec->VolSessionTime); - recs->remove(rec); - free_record(rec); - } - continue; - } /* end if label record */ + /* Some sort of label? */ + if (rec->FileIndex < 0) { + handle_session_record(dev, rec, &sessrec); + ok = record_cb(dcr, rec); + if (rec->FileIndex == EOS_LABEL) { + Dmsg2(300, "Remove rec. SI=%d ST=%d\n", rec->VolSessionId, + rec->VolSessionTime); + recs->remove(rec); + free_record(rec); + } + continue; + } /* end if label record */ - /* - * Apply BSR filter - */ - if (jcr->bsr) { - int stat = match_bsr(jcr->bsr, rec, &dev->VolHdr, &sessrec); - if (stat == -1) { /* no more possible matches */ - done = true; /* all items found, stop */ - Dmsg2(100, "All done=(file:block) %d:%d\n", dev->file, dev->block_num); - break; - } else if (stat == 0) { /* no match */ - Dmsg4(100, "Clear rem=%d FI=%d before set_eof pos %d:%d\n", - rec->remainder, rec->FileIndex, dev->file, dev->block_num); - rec->remainder = 0; - rec->state &= ~REC_PARTIAL_RECORD; - if (try_repositioning(jcr, rec, dev)) { - break; - } + /* + * Apply BSR filter + */ + if (jcr->bsr) { + int stat = match_bsr(jcr->bsr, rec, &dev->VolHdr, &sessrec); + if (stat == -1) { /* no more possible matches */ + done = true; /* all items found, stop */ + Dmsg2(300, "All done=(file:block) %u:%u\n", dev->file, dev->block_num); + break; + } else if (stat == 0) { /* no match */ + Dmsg4(300, "Clear rem=%d FI=%d before set_eof pos %u:%u\n", + rec->remainder, rec->FileIndex, dev->file, dev->block_num); + rec->remainder = 0; + rec->state &= ~REC_PARTIAL_RECORD; + if (try_repositioning(jcr, rec, dev)) { + break; + } continue; /* we don't want record, read next one */ - } - } - if (is_partial_record(rec)) { - Dmsg6(100, "Partial, break. recno=%d state=%s blk=%d SI=%d ST=%d FI=%d\n", record, - rec_state_to_str(rec), block->BlockNumber, - rec->VolSessionId, rec->VolSessionTime, rec->FileIndex); - break; /* read second part of record */ - } - ok = record_cb(jcr, dev, block, rec); - if (rec->Stream == STREAM_MD5_SIGNATURE || rec->Stream == STREAM_SHA1_SIGNATURE) { - Dmsg3(100, "Done FI=%d before set_eof pos %d:%d\n", rec->FileIndex, - dev->file, dev->block_num); - if (match_set_eof(jcr->bsr, rec) && try_repositioning(jcr, rec, dev)) { - Dmsg2(100, "Break after match_set_eof pos %d:%d\n", - dev->file, dev->block_num); - break; - } - Dmsg2(100, "After set_eof pos %d:%d\n", dev->file, dev->block_num); - } + } + } + if (is_partial_record(rec)) { + Dmsg6(300, "Partial, break. recno=%d state=%s blk=%d SI=%d ST=%d FI=%d\n", record, + rec_state_to_str(rec), block->BlockNumber, + rec->VolSessionId, rec->VolSessionTime, rec->FileIndex); + break; /* read second part of record */ + } + ok = record_cb(dcr, rec); + if (rec->Stream == STREAM_MD5_SIGNATURE || rec->Stream == STREAM_SHA1_SIGNATURE) { + Dmsg3(300, "Done FI=%u before set_eof pos %u:%u\n", rec->FileIndex, + dev->file, dev->block_num); + if (match_set_eof(jcr->bsr, rec) && try_repositioning(jcr, rec, dev)) { + Dmsg2(300, "Break after match_set_eof pos %u:%u\n", + dev->file, dev->block_num); + break; + } + Dmsg2(300, "After set_eof pos %u:%u\n", dev->file, dev->block_num); + } } /* end for loop over records */ - Dmsg2(100, "After end records position=(file:block) %d:%d\n", dev->file, dev->block_num); + Dmsg2(300, "After end records position=(file:block) %u:%u\n", dev->file, dev->block_num); } /* end for loop over blocks */ -// Dmsg2(100, "Position=(file:block) %d:%d\n", dev->file, dev->block_num); +// Dmsg2(300, "Position=(file:block) %u:%u\n", dev->file, dev->block_num); /* Walk down list and free all remaining allocated recs */ while (!recs->empty()) { @@ -250,41 +250,44 @@ bool read_records(DCR *dcr, } delete recs; print_block_read_errors(jcr, block); - free_block(block); return ok; } /* * See if we can reposition. - * Returns: 1 if at end of volume - * 0 otherwise + * Returns: true if at end of volume + * false otherwise */ -static int try_repositioning(JCR *jcr, DEV_RECORD *rec, DEVICE *dev) +static bool try_repositioning(JCR *jcr, DEV_RECORD *rec, DEVICE *dev) { BSR *bsr; bsr = find_next_bsr(jcr->bsr, dev); if (bsr == NULL && jcr->bsr->mount_next_volume) { - Dmsg0(100, "Would mount next volume here\n"); - Dmsg2(100, "Current postion (file:block) %d:%d\n", - dev->file, dev->block_num); + Dmsg0(300, "Would mount next volume here\n"); + Dmsg2(300, "Current postion (file:block) %u:%u\n", + dev->file, dev->block_num); jcr->bsr->mount_next_volume = false; - dev->state |= ST_EOT; + if (!dev->at_eot()) { + /* Set EOT flag to force mount of next Volume */ + jcr->mount_next_volume = true; + dev->state |= ST_EOT; + } rec->Block = 0; - return 1; - } + return true; + } if (bsr) { if (verbose) { - Jmsg(jcr, M_INFO, 0, "Reposition from (file:block) %d:%d to %d:%d\n", - dev->file, dev->block_num, bsr->volfile->sfile, - bsr->volblock->sblock); + Jmsg(jcr, M_INFO, 0, "Reposition from (file:block) %u:%u to %u:%u\n", + dev->file, dev->block_num, bsr->volfile->sfile, + bsr->volblock->sblock); } - Dmsg4(100, "Try_Reposition from (file:block) %d:%d to %d:%d\n", - dev->file, dev->block_num, bsr->volfile->sfile, - bsr->volblock->sblock); + Dmsg4(300, "Try_Reposition from (file:block) %u:%u to %u:%u\n", + dev->file, dev->block_num, bsr->volfile->sfile, + bsr->volblock->sblock); reposition_dev(dev, bsr->volfile->sfile, bsr->volblock->sblock); rec->Block = 0; } - return 0; + return false; } /* @@ -294,18 +297,18 @@ static BSR *position_to_first_file(JCR *jcr, DEVICE *dev) { BSR *bsr = NULL; /* - * Now find and position to first file and block - * on this tape. + * Now find and position to first file and block + * on this tape. */ if (jcr->bsr) { jcr->bsr->reposition = true; /* force repositioning */ bsr = find_next_bsr(jcr->bsr, dev); if (bsr && (bsr->volfile->sfile != 0 || bsr->volblock->sblock != 0)) { - Jmsg(jcr, M_INFO, 0, _("Forward spacing to file:block %u:%u.\n"), - bsr->volfile->sfile, bsr->volblock->sblock); - Dmsg2(100, "Forward spacing to file:block %u:%u.\n", - bsr->volfile->sfile, bsr->volblock->sblock); - reposition_dev(dev, bsr->volfile->sfile, bsr->volblock->sblock); + Jmsg(jcr, M_INFO, 0, _("Forward spacing to file:block %u:%u.\n"), + bsr->volfile->sfile, bsr->volblock->sblock); + Dmsg2(300, "Forward spacing to file:block %u:%u.\n", + bsr->volfile->sfile, bsr->volblock->sblock); + reposition_dev(dev, bsr->volfile->sfile, bsr->volblock->sblock); } } return bsr; @@ -316,11 +319,11 @@ static void handle_session_record(DEVICE *dev, DEV_RECORD *rec, SESSION_LABEL *s { const char *rtype; char buf[100]; - + memset(sessrec, 0, sizeof(sessrec)); switch (rec->FileIndex) { case PRE_LABEL: - rtype = "Fresh Volume Label"; + rtype = "Fresh Volume Label"; break; case VOL_LABEL: rtype = "Volume Label"; @@ -341,14 +344,14 @@ static void handle_session_record(DEVICE *dev, DEV_RECORD *rec, SESSION_LABEL *s rtype = buf; break; } - Dmsg5(100, "%s Record: VolSessionId=%d VolSessionTime=%d JobId=%d DataLen=%d\n", - rtype, rec->VolSessionId, rec->VolSessionTime, rec->Stream, rec->data_len); + Dmsg5(300, "%s Record: VolSessionId=%d VolSessionTime=%d JobId=%d DataLen=%d\n", + rtype, rec->VolSessionId, rec->VolSessionTime, rec->Stream, rec->data_len); } #ifdef DEBUG static char *rec_state_to_str(DEV_RECORD *rec) { - static char buf[200]; + static char buf[200]; buf[0] = 0; if (rec->state & REC_NO_HEADER) { bstrncat(buf, "Nohdr,", sizeof(buf));