X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fstored%2Fblock.c;h=8ebdaf7edff00a1cdec6593edb31949ce3aad031;hb=d6a1dde94e0ab1de2e40f5233e247f6bb0312761;hp=c1317da712b4ca0f6f8ada930c98b29be855cd25;hpb=4cd366933e81266268f69441dc0ff5f305cb897d;p=bacula%2Fbacula diff --git a/bacula/src/stored/block.c b/bacula/src/stored/block.c index c1317da712..8ebdaf7edf 100644 --- a/bacula/src/stored/block.c +++ b/bacula/src/stored/block.c @@ -2,38 +2,48 @@ * * block.c -- tape block handling functions * - * Kern Sibbald, March MMI - * added BB02 format October MMII + * Kern Sibbald, March MMI + * added BB02 format October MMII * * Version $Id$ * */ /* - Copyright (C) 2000-2005 Kern Sibbald + Bacula® - The Network Backup Solution - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License as - published by the Free Software Foundation; either version 2 of - the License, or (at your option) any later version. + Copyright (C) 2001-2006 Free Software Foundation Europe e.V. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of + The main author of Bacula is Kern Sibbald, with contributions from + many others, a complete list can be found in the file AUTHORS. + This program is Free Software; you can redistribute it and/or + modify it under the terms of version two of the GNU General Public + License as published by the Free Software Foundation plus additions + that are listed in the file LICENSE. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public - License along with this program; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA. + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. - */ + Bacula® is a registered trademark of John Walker. + The licensor of Bacula is the Free Software Foundation Europe + (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich, + Switzerland, email:ftf@fsfeurope.org. +*/ #include "bacula.h" #include "stored.h" -extern int debug_level; static bool terminate_writing_volume(DCR *dcr); +static bool do_new_file_bookkeeping(DCR *dcr); +static bool do_dvd_size_checks(DCR *dcr); +static void reread_last_block(DCR *dcr); /* * Dump the block header, then walk through @@ -51,6 +61,7 @@ void dump_block(DEV_BLOCK *b, const char *msg) int32_t FileIndex; int32_t Stream; int bhl, rhl; + char buf1[100], buf2[100]; unser_begin(b->buf, BLKHDR1_LENGTH); unser_uint32(CheckSum); @@ -76,23 +87,23 @@ void dump_block(DEV_BLOCK *b, const char *msg) } BlockCheckSum = bcrc32((uint8_t *)b->buf+BLKHDR_CS_LENGTH, - block_len-BLKHDR_CS_LENGTH); - Pmsg6(000, "Dump block %s %x: size=%d BlkNum=%d\n" -" Hdrcksum=%x cksum=%x\n", + block_len-BLKHDR_CS_LENGTH); + Pmsg6(000, _("Dump block %s %x: size=%d BlkNum=%d\n" +" Hdrcksum=%x cksum=%x\n"), msg, b, block_len, BlockNumber, CheckSum, BlockCheckSum); p = b->buf + bhl; while (p < (b->buf + block_len+WRITE_RECHDR_LENGTH)) { unser_begin(p, WRITE_RECHDR_LENGTH); if (rhl == RECHDR1_LENGTH) { - unser_uint32(VolSessionId); - unser_uint32(VolSessionTime); + unser_uint32(VolSessionId); + unser_uint32(VolSessionTime); } unser_int32(FileIndex); unser_int32(Stream); unser_uint32(data_len); - Pmsg6(000, " Rec: VId=%u VT=%u FI=%s Strm=%s len=%d p=%x\n", - VolSessionId, VolSessionTime, FI_to_ascii(FileIndex), - stream_to_ascii(Stream, FileIndex), data_len, p); + Pmsg6(000, _(" Rec: VId=%u VT=%u FI=%s Strm=%s len=%d p=%x\n"), + VolSessionId, VolSessionTime, FI_to_ascii(buf1, FileIndex), + stream_to_ascii(buf2, Stream, FileIndex), data_len, p); p += data_len + rhl; } } @@ -119,7 +130,7 @@ DEV_BLOCK *new_block(DEVICE *dev) block->buf = get_memory(block->buf_len); empty_block(block); block->BlockVer = BLOCK_VER; /* default write version */ - Dmsg1(350, "Returning new block=%x\n", block); + Dmsg1(650, "Returning new block=%x\n", block); return block; } @@ -147,7 +158,7 @@ void print_block_read_errors(JCR *jcr, DEV_BLOCK *block) { if (block->read_errors > 1) { Jmsg(jcr, M_ERROR, 0, _("%d block read errors not printed.\n"), - block->read_errors); + block->read_errors); } } @@ -156,9 +167,9 @@ void print_block_read_errors(JCR *jcr, DEV_BLOCK *block) */ void free_block(DEV_BLOCK *block) { - Dmsg1(199, "free_block buffer %x\n", block->buf); + Dmsg1(999, "free_block buffer %x\n", block->buf); free_memory(block->buf); - Dmsg1(199, "free_block block %x\n", block); + Dmsg1(999, "free_block block %x\n", block); free_memory((POOLMEM *)block); } @@ -184,7 +195,7 @@ void ser_block_header(DEV_BLOCK *block) uint32_t CheckSum = 0; uint32_t block_len = block->binbuf; - Dmsg1(390, "ser_block_header: block_len=%d\n", block_len); + Dmsg1(1390, "ser_block_header: block_len=%d\n", block_len); ser_begin(block->buf, BLKHDR2_LENGTH); ser_uint32(CheckSum); ser_uint32(block_len); @@ -197,10 +208,10 @@ void ser_block_header(DEV_BLOCK *block) /* Checksum whole block except for the checksum */ CheckSum = bcrc32((uint8_t *)block->buf+BLKHDR_CS_LENGTH, - block_len-BLKHDR_CS_LENGTH); - Dmsg1(390, "ser_bloc_header: checksum=%x\n", CheckSum); + block_len-BLKHDR_CS_LENGTH); + Dmsg1(1390, "ser_bloc_header: checksum=%x\n", CheckSum); ser_begin(block->buf, BLKHDR2_LENGTH); - ser_uint32(CheckSum); /* now add checksum to block header */ + ser_uint32(CheckSum); /* now add checksum to block header */ } /* @@ -208,7 +219,7 @@ void ser_block_header(DEV_BLOCK *block) * This includes setting all the buffer pointers correctly. * * Returns: false on failure (not a block) - * true on success + * true on success */ static bool unser_block_header(JCR *jcr, DEVICE *dev, DEV_BLOCK *block) { @@ -233,14 +244,14 @@ static bool unser_block_header(JCR *jcr, DEVICE *dev, DEV_BLOCK *block) block->BlockVer = 1; block->bufp = block->buf + bhl; if (strncmp(Id, BLKHDR1_ID, BLKHDR_ID_LENGTH) != 0) { - dev->dev_errno = EIO; + dev->dev_errno = EIO; Mmsg4(dev->errmsg, _("Volume data error at %u:%u! Wanted ID: \"%s\", got \"%s\". Buffer discarded.\n"), - dev->file, dev->block_num, BLKHDR1_ID, Id); - if (block->read_errors == 0 || verbose >= 2) { + dev->file, dev->block_num, BLKHDR1_ID, Id); + if (block->read_errors == 0 || verbose >= 2) { Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg); - } - block->read_errors++; - return false; + } + block->read_errors++; + return false; } } else if (Id[3] == '2') { unser_uint32(block->VolSessionId); @@ -249,19 +260,19 @@ static bool unser_block_header(JCR *jcr, DEVICE *dev, DEV_BLOCK *block) block->BlockVer = 2; block->bufp = block->buf + bhl; if (strncmp(Id, BLKHDR2_ID, BLKHDR_ID_LENGTH) != 0) { - dev->dev_errno = EIO; + dev->dev_errno = EIO; Mmsg4(dev->errmsg, _("Volume data error at %u:%u! Wanted ID: \"%s\", got \"%s\". Buffer discarded.\n"), - dev->file, dev->block_num, BLKHDR2_ID, Id); - if (block->read_errors == 0 || verbose >= 2) { + dev->file, dev->block_num, BLKHDR2_ID, Id); + if (block->read_errors == 0 || verbose >= 2) { Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg); - } - block->read_errors++; - return false; + } + block->read_errors++; + return false; } } else { dev->dev_errno = EIO; Mmsg4(dev->errmsg, _("Volume data error at %u:%u! Wanted ID: \"%s\", got \"%s\". Buffer discarded.\n"), - dev->file, dev->block_num, BLKHDR2_ID, Id); + dev->file, dev->block_num, BLKHDR2_ID, Id); if (block->read_errors == 0 || verbose >= 2) { Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg); } @@ -275,7 +286,7 @@ static bool unser_block_header(JCR *jcr, DEVICE *dev, DEV_BLOCK *block) if (block_len > MAX_BLOCK_LENGTH) { dev->dev_errno = EIO; Mmsg3(dev->errmsg, _("Volume data error at %u:%u! Block length %u is insane (too large), probably due to a bad archive.\n"), - dev->file, dev->block_num, block_len); + dev->file, dev->block_num, block_len); if (block->read_errors == 0 || verbose >= 2) { Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg); } @@ -297,20 +308,20 @@ static bool unser_block_header(JCR *jcr, DEVICE *dev, DEV_BLOCK *block) bhl, block_len); if (block_len <= block->read_len) { BlockCheckSum = bcrc32((uint8_t *)block->buf+BLKHDR_CS_LENGTH, - block_len-BLKHDR_CS_LENGTH); + block_len-BLKHDR_CS_LENGTH); if (BlockCheckSum != CheckSum) { - dev->dev_errno = EIO; + dev->dev_errno = EIO; Mmsg6(dev->errmsg, _("Volume data error at %u:%u!\n" "Block checksum mismatch in block=%u len=%d: calc=%x blk=%x\n"), - dev->file, dev->block_num, (unsigned)BlockNumber, - block_len, BlockCheckSum, CheckSum); - if (block->read_errors == 0 || verbose >= 2) { + dev->file, dev->block_num, (unsigned)BlockNumber, + block_len, BlockCheckSum, CheckSum); + if (block->read_errors == 0 || verbose >= 2) { Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg); - } - block->read_errors++; - if (!forge_on) { - return false; - } + } + block->read_errors++; + if (!forge_on) { + return false; + } } } return true; @@ -320,7 +331,7 @@ static bool unser_block_header(JCR *jcr, DEVICE *dev, DEV_BLOCK *block) * Write a block to the device, with locking and unlocking * * Returns: true on success - * : false on failure + * : false on failure * */ bool write_block_to_device(DCR *dcr) @@ -334,50 +345,50 @@ bool write_block_to_device(DCR *dcr) return stat; } - if (!dcr->dev_locked) { - lock_device(dev); + if (!dcr->dev_locked) { /* device already locked? */ + lock_device(dev); /* no, lock it */ } /* * If a new volume has been mounted since our last write - * Create a JobMedia record for the previous volume written, - * and set new parameters to write this volume + * Create a JobMedia record for the previous volume written, + * and set new parameters to write this volume * The same applies for if we are in a new file. */ if (dcr->NewVol || dcr->NewFile) { if (job_canceled(jcr)) { - stat = false; - goto bail_out; + stat = false; + goto bail_out; } /* Create a jobmedia record for this job */ if (!dir_create_jobmedia_record(dcr)) { - dev->dev_errno = EIO; + dev->dev_errno = EIO; Jmsg(jcr, M_FATAL, 0, _("Could not create JobMedia record for Volume=\"%s\" Job=%s\n"), - dcr->VolCatInfo.VolCatName, jcr->Job); - set_new_volume_parameters(dcr); - stat = false; - goto bail_out; + dcr->VolCatInfo.VolCatName, jcr->Job); + set_new_volume_parameters(dcr); + stat = false; + goto bail_out; } if (dcr->NewVol) { - /* Note, setting a new volume also handles any pending new file */ - set_new_volume_parameters(dcr); - dcr->NewFile = false; /* this handled for new file too */ + /* Note, setting a new volume also handles any pending new file */ + set_new_volume_parameters(dcr); + dcr->NewFile = false; /* this handled for new file too */ } else { - set_new_file_parameters(dcr); + set_new_file_parameters(dcr); } } if (!write_block_to_dev(dcr)) { if (job_canceled(jcr) || jcr->JobType == JT_SYSTEM) { - stat = false; + stat = false; } else { - stat = fixup_device_block_write_error(dcr); + stat = fixup_device_block_write_error(dcr); } } bail_out: - if (!dcr->dev_locked) { - unlock_device(dev); + if (!dcr->dev_locked) { /* did we lock dev above? */ + unlock_device(dev); /* unlock it now */ } return stat; } @@ -386,12 +397,12 @@ bail_out: * Write a block to the device * * Returns: true on success or EOT - * false on hard error + * false on hard error */ bool write_block_to_dev(DCR *dcr) { ssize_t stat = 0; - uint32_t wlen; /* length to write */ + uint32_t wlen; /* length to write */ int hit_max1, hit_max2; bool ok = true; DEVICE *dev = dcr->dev; @@ -403,15 +414,16 @@ bool write_block_to_dev(DCR *dcr) return true; #endif ASSERT(block->binbuf == ((uint32_t) (block->bufp - block->buf))); + ASSERT(dev->is_open()); /* dump_block(block, "before write"); */ - if (dev->state & ST_WEOT) { + if (dev->at_weot()) { Dmsg0(100, "return write_block_to_dev with ST_WEOT\n"); dev->dev_errno = ENOSPC; Jmsg(jcr, M_FATAL, 0, _("Cannot write block. Device at EOM.\n")); return false; } - if (!(dev->state & ST_APPEND)) { + if (!dev->can_append()) { dev->dev_errno = EIO; Jmsg(jcr, M_FATAL, 0, _("Attempt to write on read-only Volume.\n")); return false; @@ -426,26 +438,26 @@ bool write_block_to_dev(DCR *dcr) * and on tape devices, apply min and fixed blocking. */ if (wlen != block->buf_len) { - uint32_t blen; /* current buffer length */ + uint32_t blen; /* current buffer length */ Dmsg2(200, "binbuf=%d buf_len=%d\n", block->binbuf, block->buf_len); blen = wlen; /* Adjust write size to min/max for tapes only */ - if (dev->state & ST_TAPE) { - /* check for fixed block size */ - if (dev->min_block_size == dev->max_block_size) { - wlen = block->buf_len; /* fixed block size already rounded */ - /* Check for min block size */ - } else if (wlen < dev->min_block_size) { - wlen = ((dev->min_block_size + TAPE_BSIZE - 1) / TAPE_BSIZE) * TAPE_BSIZE; - /* Ensure size is rounded */ - } else { - wlen = ((wlen + TAPE_BSIZE - 1) / TAPE_BSIZE) * TAPE_BSIZE; - } + if (dev->is_tape()) { + /* check for fixed block size */ + if (dev->min_block_size == dev->max_block_size) { + wlen = block->buf_len; /* fixed block size already rounded */ + /* Check for min block size */ + } else if (wlen < dev->min_block_size) { + wlen = ((dev->min_block_size + TAPE_BSIZE - 1) / TAPE_BSIZE) * TAPE_BSIZE; + /* Ensure size is rounded */ + } else { + wlen = ((wlen + TAPE_BSIZE - 1) / TAPE_BSIZE) * TAPE_BSIZE; + } } if (wlen-blen > 0) { - memset(block->bufp, 0, wlen-blen); /* clear garbage */ + memset(block->bufp, 0, wlen-blen); /* clear garbage */ } } @@ -461,13 +473,14 @@ bool write_block_to_dev(DCR *dcr) uint64_t max_cap; Dmsg0(10, "==== Output bytes Triggered medium max capacity.\n"); if (hit_max1) { - max_cap = dev->max_volume_size; + max_cap = dev->max_volume_size; } else { - max_cap = dev->VolCatInfo.VolCatMaxBytes; + max_cap = dev->VolCatInfo.VolCatMaxBytes; } Jmsg(jcr, M_INFO, 0, _("User defined maximum volume capacity %s exceeded on device %s.\n"), - edit_uint64_with_commas(max_cap, ed1), dev->dev_name); + edit_uint64_with_commas(max_cap, ed1), dev->print_name()); terminate_writing_volume(dcr); + reread_last_block(dcr); /* DEBUG */ dev->dev_errno = ENOSPC; return false; } @@ -475,116 +488,65 @@ bool write_block_to_dev(DCR *dcr) /* Limit maximum File size on volume to user specified value */ if ((dev->max_file_size > 0) && (dev->file_size+block->binbuf) >= dev->max_file_size) { - dev->file_size = 0; /* reset file size */ + dev->file_size = 0; /* reset file size */ - if (dev->is_tape() && weof_dev(dev, 1) != 0) { /* write eof */ + if (!dev->weof(1)) { /* write eof */ Dmsg0(190, "WEOF error in max file size.\n"); - terminate_writing_volume(dcr); - dev->dev_errno = ENOSPC; - return false; + Jmsg(jcr, M_FATAL, 0, _("Unable to write EOF. ERR=%s\n"), + dev->bstrerror()); + terminate_writing_volume(dcr); + dev->dev_errno = ENOSPC; + return false; } - - /* Create a JobMedia record so restore can seek */ - if (!dir_create_jobmedia_record(dcr)) { - Dmsg0(190, "Error from create_job_media.\n"); - dev->dev_errno = EIO; - Jmsg(jcr, M_FATAL, 0, _("Could not create JobMedia record for Volume=\"%s\" Job=%s\n"), - dcr->VolCatInfo.VolCatName, jcr->Job); - terminate_writing_volume(dcr); - dev->dev_errno = EIO; - return false; - } - dev->VolCatInfo.VolCatFiles = dev->file; - if (!dir_update_volume_info(dcr, false)) { - Dmsg0(190, "Error from update_vol_info.\n"); - terminate_writing_volume(dcr); - dev->dev_errno = EIO; - return false; + if (!write_ansi_ibm_labels(dcr, ANSI_EOF_LABEL, dev->VolHdr.VolumeName)) { + return false; } - Dmsg0(100, "dir_update_volume_info max file size -- OK\n"); - - /* - * Walk through all attached dcrs setting flag to call - * set_new_file_parameters() when that dcr is next used. - */ - DCR *mdcr; - foreach_dlist(mdcr, dev->attached_dcrs) { - if (mdcr->jcr->JobId == 0) { - continue; - } - mdcr->NewFile = true; /* set reminder to do set_new_file_params */ - } - /* Set new file/block parameters for current dcr */ - set_new_file_parameters(dcr); - } - - /* Limit maximum part size to value specified by user (not applicable to tapes/fifos) */ - if (!(dev->state & (ST_TAPE|ST_FIFO)) && - (dev->max_part_size > 0) && - ((dev->part_size + block->binbuf) >= dev->max_part_size)) { - if (dev->part < dev->num_parts) { - Jmsg3(dcr->jcr, M_FATAL, 0, _("Error while writing, current part number is less than the total number of parts (%d/%d, device=%s)\n"), - dev->part, dev->num_parts, dev_name(dev)); - dev->dev_errno = EIO; - return false; - } - - if (open_next_part(dev) < 0) { - Jmsg2(dcr->jcr, M_FATAL, 0, _("Unable to open device next part %s. ERR=%s\n"), - dev_name(dev), strerror_dev(dev)); - dev->dev_errno = EIO; - return false; - } - - dev->VolCatInfo.VolCatParts = dev->num_parts; - - if (!dir_update_volume_info(dcr, false)) { - Dmsg0(190, "Error from update_vol_info.\n"); - dev->dev_errno = EIO; - return false; + if (!do_new_file_bookkeeping(dcr)) { + /* Error message already sent */ + return false; } } - if (dev->free_space_errno < 0) { /* Error while getting free space */ - char ed1[50], ed2[50]; - Dmsg1(10, "Cannot get free space on the device ERR=%s.\n", dev->errmsg); - Jmsg(jcr, M_FATAL, 0, _("End of Volume \"%s\" at %u:%u on device %s (part_size=%s, free_space=%s, free_space_errno=%d, errmsg=%s).\n"), - dev->VolCatInfo.VolCatName, - dev->file, dev->block_num, dev->dev_name, - edit_uint64_with_commas(dev->part_size, ed1), edit_uint64_with_commas(dev->free_space, ed2), - dev->free_space_errno, dev->errmsg); - dev->dev_errno = -dev->free_space_errno; + if (!do_dvd_size_checks(dcr)) { + /* Error message already sent */ return false; } - - if (((dev->free_space_errno > 0) && ((dev->part_size + block->binbuf) >= dev->free_space))) { - char ed1[50], ed2[50]; - Dmsg0(10, "==== Just enough free space on the device to write the current part...\n"); - Jmsg(jcr, M_INFO, 0, _("End of Volume \"%s\" at %u:%u on device %s (part_size=%s, free_space=%s, free_space_errno=%d).\n"), - dev->VolCatInfo.VolCatName, - dev->file, dev->block_num, dev->dev_name, - edit_uint64_with_commas(dev->part_size, ed1), edit_uint64_with_commas(dev->free_space, ed2), - dev->free_space_errno); - terminate_writing_volume(dcr); - dev->dev_errno = ENOSPC; - return false; - } dev->VolCatInfo.VolCatWrites++; - Dmsg1(300, "Write block of %u bytes\n", wlen); + Dmsg1(1300, "Write block of %u bytes\n", wlen); #ifdef DEBUG_BLOCK_ZEROING uint32_t *bp = (uint32_t *)block->buf; if (bp[0] == 0 && bp[1] == 0 && bp[2] == 0 && block->buf[12] == 0) { - Jmsg0(jcr, M_ABORT, 0, "Write block header zeroed.\n"); + Jmsg0(jcr, M_ABORT, 0, _("Write block header zeroed.\n")); } #endif - stat = write(dev->fd, block->buf, (size_t)wlen); + /* + * Do write here, make a somewhat feeble attempt to recover from + * I/O errors, or from the OS telling us it is busy. + */ + int retry = 0; + errno = 0; + stat = 0; + do { + if (retry > 0 && stat == -1 && errno == EBUSY) { + berrno be; + Dmsg4(100, "===== write retry=%d stat=%d errno=%d: ERR=%s\n", + retry, stat, errno, be.strerror()); + bmicrosleep(5, 0); /* pause a bit if busy or lots of errors */ + dev->clrerror(-1); + } + if (dev->is_tape()) { + stat = tape_write(dev->fd, block->buf, (size_t)wlen); + } else { + stat = write(dev->fd, block->buf, (size_t)wlen); + } + } while (stat == -1 && (errno == EBUSY || errno == EIO) && retry++ < 3); #ifdef DEBUG_BLOCK_ZEROING if (bp[0] == 0 && bp[1] == 0 && bp[2] == 0 && block->buf[12] == 0) { - Jmsg0(jcr, M_ABORT, 0, "Write block header zeroed.\n"); + Jmsg0(jcr, M_ABORT, 0, _("Write block header zeroed.\n")); } #endif @@ -596,104 +558,59 @@ bool write_block_to_dev(DCR *dcr) * simulate an End of Medium. */ if (stat == -1) { - berrno be; - clrerror_dev(dev, -1); - if (dev->dev_errno == 0) { - dev->dev_errno = ENOSPC; /* out of space */ - } - if (dev->dev_errno != ENOSPC) { + berrno be; + dev->clrerror(-1); + if (dev->dev_errno == 0) { + dev->dev_errno = ENOSPC; /* out of space */ + } + if (dev->dev_errno != ENOSPC) { + dev->VolCatInfo.VolCatErrors++; Jmsg4(jcr, M_ERROR, 0, _("Write error at %u:%u on device %s. ERR=%s.\n"), - dev->file, dev->block_num, dev->dev_name, be.strerror()); - } + dev->file, dev->block_num, dev->print_name(), be.strerror()); + } } else { - dev->dev_errno = ENOSPC; /* out of space */ + dev->dev_errno = ENOSPC; /* out of space */ } if (dev->dev_errno == ENOSPC) { Jmsg(jcr, M_INFO, 0, _("End of Volume \"%s\" at %u:%u on device %s. Write of %u bytes got %d.\n"), - dev->VolCatInfo.VolCatName, - dev->file, dev->block_num, dev->dev_name, wlen, stat); + dev->VolCatInfo.VolCatName, + dev->file, dev->block_num, dev->print_name(), wlen, stat); } - Dmsg6(100, "=== Write error. size=%u rtn=%d dev_blk=%d blk_blk=%d errno=%d: ERR=%s\n", - wlen, stat, dev->block_num, block->BlockNumber, dev->dev_errno, strerror(dev->dev_errno)); + Dmsg7(100, "=== Write error. fd=%d size=%u rtn=%d dev_blk=%d blk_blk=%d errno=%d: ERR=%s\n", + dev->fd, wlen, stat, dev->block_num, block->BlockNumber, + dev->dev_errno, strerror(dev->dev_errno)); ok = terminate_writing_volume(dcr); if (!ok && !forge_on) { - return false; + return false; } - -#define CHECK_LAST_BLOCK -#ifdef CHECK_LAST_BLOCK - /* - * If the device is a tape and it supports backspace record, - * we backspace over one or two eof marks depending on - * how many we just wrote, then over the last record, - * then re-read it and verify that the block number is - * correct. - */ - if (ok && (dev->state & ST_TAPE) && dev_cap(dev, CAP_BSR)) { - /* Now back up over what we wrote and read the last block */ - if (!bsf_dev(dev, 1)) { - ok = false; - Jmsg(jcr, M_ERROR, 0, _("Backspace file at EOT failed. ERR=%s\n"), strerror(dev->dev_errno)); - } - if (ok && dev_cap(dev, CAP_TWOEOF) && !bsf_dev(dev, 1)) { - ok = false; - Jmsg(jcr, M_ERROR, 0, _("Backspace file at EOT failed. ERR=%s\n"), strerror(dev->dev_errno)); - } - /* Backspace over record */ - if (ok && !bsr_dev(dev, 1)) { - ok = false; - Jmsg(jcr, M_ERROR, 0, _("Backspace record at EOT failed. ERR=%s\n"), strerror(dev->dev_errno)); - /* - * On FreeBSD systems, if the user got here, it is likely that his/her - * tape drive is "frozen". The correct thing to do is a - * rewind(), but if we do that, higher levels in cleaning up, will - * most likely write the EOS record over the beginning of the - * tape. The rewind *is* done later in mount.c when another - * tape is requested. Note, the clrerror_dev() call in bsr_dev() - * calls ioctl(MTCERRSTAT), which *should* fix the problem. - */ - } - if (ok) { - DEV_BLOCK *lblock = new_block(dev); - /* Note, this can destroy dev->errmsg */ - dcr->block = lblock; - if (!read_block_from_dev(dcr, NO_BLOCK_NUMBER_CHECK)) { - Jmsg(jcr, M_ERROR, 0, _("Re-read last block at EOT failed. ERR=%s"), dev->errmsg); - } else { - if (lblock->BlockNumber+1 == block->BlockNumber) { - Jmsg(jcr, M_INFO, 0, _("Re-read of last block succeeded.\n")); - } else { - Jmsg(jcr, M_ERROR, 0, _( -"Re-read of last block failed. Last block=%u Current block=%u.\n"), - lblock->BlockNumber, block->BlockNumber); - } - } - free_block(lblock); - dcr->block = block; - } + if (ok) { + reread_last_block(dcr); } -#endif return false; } /* We successfully wrote the block, now do housekeeping */ - - dev->VolCatInfo.VolCatBytes += block->binbuf; + Dmsg2(1300, "VolCatBytes=%d newVolCatBytes=%d\n", (int)dev->VolCatInfo.VolCatBytes, + (int)(dev->VolCatInfo.VolCatBytes+wlen)); + dev->VolCatInfo.VolCatBytes += wlen; dev->VolCatInfo.VolCatBlocks++; dev->EndBlock = dev->block_num; dev->EndFile = dev->file; - dev->block_num++; block->BlockNumber++; /* Update dcr values */ - if (dev_state(dev, ST_TAPE)) { + if (dev->is_tape()) { dcr->EndBlock = dev->EndBlock; dcr->EndFile = dev->EndFile; + dev->block_num++; } else { - /* Save address of start of block just written */ - dcr->EndBlock = (uint32_t)dev->file_addr; - dcr->EndFile = (uint32_t)(dev->file_addr >> 32); + /* Save address of block just written */ + uint64_t addr = dev->file_addr + wlen - 1; + dcr->EndBlock = (uint32_t)addr; + dcr->EndFile = (uint32_t)(addr >> 32); + dev->block_num = dcr->EndBlock; + dev->file = dcr->EndFile; } if (dcr->VolFirstIndex == 0 && block->FirstIndex > 0) { dcr->VolFirstIndex = block->FirstIndex; @@ -702,15 +619,88 @@ bool write_block_to_dev(DCR *dcr) dcr->VolLastIndex = block->LastIndex; } dcr->WroteVol = true; - dev->file_addr += wlen; /* update file address */ + dev->file_addr += wlen; /* update file address */ dev->file_size += wlen; dev->part_size += wlen; - Dmsg2(300, "write_block: wrote block %d bytes=%d\n", dev->block_num, wlen); + Dmsg2(1300, "write_block: wrote block %d bytes=%d\n", dev->block_num, wlen); empty_block(block); return true; } +static void reread_last_block(DCR *dcr) +{ +#define CHECK_LAST_BLOCK +#ifdef CHECK_LAST_BLOCK + bool ok = true; + DEVICE *dev = dcr->dev; + JCR *jcr = dcr->jcr; + DEV_BLOCK *block = dcr->block; + /* + * If the device is a tape and it supports backspace record, + * we backspace over one or two eof marks depending on + * how many we just wrote, then over the last record, + * then re-read it and verify that the block number is + * correct. + */ + if (dev->is_tape() && dev->has_cap(CAP_BSR)) { + /* Now back up over what we wrote and read the last block */ + if (!dev->bsf(1)) { + berrno be; + ok = false; + Jmsg(jcr, M_ERROR, 0, _("Backspace file at EOT failed. ERR=%s\n"), + be.strerror(dev->dev_errno)); + } + if (ok && dev->has_cap(CAP_TWOEOF) && !dev->bsf(1)) { + berrno be; + ok = false; + Jmsg(jcr, M_ERROR, 0, _("Backspace file at EOT failed. ERR=%s\n"), + be.strerror(dev->dev_errno)); + } + /* Backspace over record */ + if (ok && !dev->bsr(1)) { + berrno be; + ok = false; + Jmsg(jcr, M_ERROR, 0, _("Backspace record at EOT failed. ERR=%s\n"), + be.strerror(dev->dev_errno)); + /* + * On FreeBSD systems, if the user got here, it is likely that his/her + * tape drive is "frozen". The correct thing to do is a + * rewind(), but if we do that, higher levels in cleaning up, will + * most likely write the EOS record over the beginning of the + * tape. The rewind *is* done later in mount.c when another + * tape is requested. Note, the clrerror() call in bsr() + * calls ioctl(MTCERRSTAT), which *should* fix the problem. + */ + } + if (ok) { + DEV_BLOCK *lblock = new_block(dev); + /* Note, this can destroy dev->errmsg */ + dcr->block = lblock; + if (!read_block_from_dev(dcr, NO_BLOCK_NUMBER_CHECK)) { + Jmsg(jcr, M_ERROR, 0, _("Re-read last block at EOT failed. ERR=%s"), + dev->errmsg); + } else { + /* + * If we wrote block and the block numbers don't agree + * we have a possible problem. + */ + if (lblock->VolSessionId == block->VolSessionId && + lblock->BlockNumber+1 != block->BlockNumber) { + Jmsg(jcr, M_ERROR, 0, _( +"Re-read of last block OK, but block numbers differ. Last block=%u Current block=%u.\n"), + lblock->BlockNumber, block->BlockNumber); + } else { + Jmsg(jcr, M_INFO, 0, _("Re-read of last block succeeded.\n")); + } + } + free_block(lblock); + dcr->block = block; + } + } +#endif +} + static bool terminate_writing_volume(DCR *dcr) { DEVICE *dev = dcr->dev; @@ -722,22 +712,35 @@ static bool terminate_writing_volume(DCR *dcr) Dmsg0(190, "Error from create JobMedia\n"); dev->dev_errno = EIO; Jmsg(dcr->jcr, M_FATAL, 0, _("Could not create JobMedia record for Volume=\"%s\" Job=%s\n"), - dcr->VolCatInfo.VolCatName, dcr->jcr->Job); + dcr->VolCatInfo.VolCatName, dcr->jcr->Job); ok = false; goto bail_out; } dcr->block->write_failed = true; - if (weof_dev(dev, 1) != 0) { /* end the tape */ + if (!dev->weof(1)) { /* end the tape */ dev->VolCatInfo.VolCatErrors++; - Jmsg(dcr->jcr, M_ERROR, 0, "Error writing final EOF to tape. This tape may not be readable.\n" - "%s", dev->errmsg); + Jmsg(dcr->jcr, M_ERROR, 0, _("Error writing final EOF to tape. This Volume may not be readable.\n" + "%s"), dev->errmsg); ok = false; Dmsg0(100, "WEOF error.\n"); } - dev->VolCatInfo.VolCatFiles = dev->file; + if (ok) { + ok = write_ansi_ibm_labels(dcr, ANSI_EOV_LABEL, dev->VolHdr.VolumeName); + } + bstrncpy(dev->VolCatInfo.VolCatStatus, "Full", sizeof(dev->VolCatInfo.VolCatStatus)); + dev->VolCatInfo.VolCatFiles = dev->file; /* set number of files */ + dev->VolCatInfo.VolCatJobs++; /* increment number of jobs */ - if (dev->is_dvd()) { /* Write the current (and last) part. */ - open_next_part(dev); + if (dev->is_dvd()) { + if (!dvd_write_part(dcr)) { /* write last part */ + dev->VolCatInfo.VolCatErrors++; + Jmsg(dcr->jcr, M_FATAL, 0, _("Error writing final part to DVD. " + "This Volume may not be readable.\n%s"), + dev->errmsg); + ok = false; + Dmsg0(100, "dvd_write_part error.\n"); + } + dev->VolCatInfo.VolCatParts = dev->num_dvd_parts; } if (!dir_update_volume_info(dcr, false)) { @@ -745,7 +748,6 @@ static bool terminate_writing_volume(DCR *dcr) } Dmsg1(100, "dir_update_volume_info terminate writing -- %s\n", ok?"OK":"ERROR"); - /* * Walk through all attached dcrs setting flag to call * set_new_file_parameters() when that dcr is next used. @@ -753,25 +755,141 @@ static bool terminate_writing_volume(DCR *dcr) DCR *mdcr; foreach_dlist(mdcr, dev->attached_dcrs) { if (mdcr->jcr->JobId == 0) { - continue; + continue; } - mdcr->NewFile = true; /* set reminder to do set_new_file_params */ + mdcr->NewFile = true; /* set reminder to do set_new_file_params */ } /* Set new file/block parameters for current dcr */ set_new_file_parameters(dcr); - if (ok && dev_cap(dev, CAP_TWOEOF) && weof_dev(dev, 1) != 0) { /* end the tape */ + if (ok && dev->has_cap(CAP_TWOEOF) && !dev->weof(1)) { /* end the tape */ dev->VolCatInfo.VolCatErrors++; /* This may not be fatal since we already wrote an EOF */ Jmsg(dcr->jcr, M_ERROR, 0, "%s", dev->errmsg); } bail_out: - dev->state |= (ST_EOF|ST_EOT|ST_WEOT); - dev->state &= ~ST_APPEND; /* make tape read-only */ + dev->set_ateot(); /* no more writing this tape */ Dmsg1(100, "Leave terminate_writing_volume -- %s\n", ok?"OK":"ERROR"); return ok; } +/* + * Do bookkeeping when a new file is created on a Volume. This is + * also done for disk files to generate the jobmedia records for + * quick seeking. + */ +static bool do_new_file_bookkeeping(DCR *dcr) +{ + DEVICE *dev = dcr->dev; + JCR *jcr = dcr->jcr; + + /* Create a JobMedia record so restore can seek */ + if (!dir_create_jobmedia_record(dcr)) { + Dmsg0(190, "Error from create_job_media.\n"); + dev->dev_errno = EIO; + Jmsg(jcr, M_FATAL, 0, _("Could not create JobMedia record for Volume=\"%s\" Job=%s\n"), + dcr->VolCatInfo.VolCatName, jcr->Job); + terminate_writing_volume(dcr); + dev->dev_errno = EIO; + return false; + } + dev->VolCatInfo.VolCatFiles = dev->file; + if (!dir_update_volume_info(dcr, false)) { + Dmsg0(190, "Error from update_vol_info.\n"); + terminate_writing_volume(dcr); + dev->dev_errno = EIO; + return false; + } + Dmsg0(100, "dir_update_volume_info max file size -- OK\n"); + + /* + * Walk through all attached dcrs setting flag to call + * set_new_file_parameters() when that dcr is next used. + */ + DCR *mdcr; + foreach_dlist(mdcr, dev->attached_dcrs) { + if (mdcr->jcr->JobId == 0) { + continue; + } + mdcr->NewFile = true; /* set reminder to do set_new_file_params */ + } + /* Set new file/block parameters for current dcr */ + set_new_file_parameters(dcr); + return true; +} + +/* + * Do all checks for DVD sizes during writing. + */ +static bool do_dvd_size_checks(DCR *dcr) +{ + DEVICE *dev = dcr->dev; + JCR *jcr = dcr->jcr; + DEV_BLOCK *block = dcr->block; + + /* Don't go further if the device is not a dvd */ + if (!dev->is_dvd()) { + return true; + } + + /* Limit maximum part size to value specified by user + */ + if (dev->max_part_size > 0 && ((dev->part_size + block->binbuf) >= dev->max_part_size)) { + if (dev->part < dev->num_dvd_parts) { + Jmsg3(dcr->jcr, M_FATAL, 0, _("Error while writing, current part number" + " is less than the total number of parts (%d/%d, device=%s)\n"), + dev->part, dev->num_dvd_parts, dev->print_name()); + dev->dev_errno = EIO; + return false; + } + + if (dvd_open_next_part(dcr) < 0) { + Jmsg2(dcr->jcr, M_FATAL, 0, _("Unable to open device next part %s: ERR=%s\n"), + dev->print_name(), dev->bstrerror()); + dev->dev_errno = EIO; + return false; + } + + dev->VolCatInfo.VolCatParts = dev->num_dvd_parts; + + if (!dir_update_volume_info(dcr, false)) { + Dmsg0(190, "Error from update_vol_info.\n"); + dev->dev_errno = EIO; + return false; + } + } + + dev->update_freespace(); + + if (!dev->is_freespace_ok()) { /* Error while getting free space */ + char ed1[50], ed2[50]; + Dmsg1(10, "Cannot get free space on the device ERR=%s.\n", dev->errmsg); + Jmsg(jcr, M_FATAL, 0, _("End of Volume \"%s\" at %u:%u on device %s " + "(part_size=%s, free_space=%s, free_space_errno=%d, errmsg=%s).\n"), + dev->VolCatInfo.VolCatName, + dev->file, dev->block_num, dev->print_name(), + edit_uint64_with_commas(dev->part_size, ed1), edit_uint64_with_commas(dev->free_space, ed2), + dev->free_space_errno, dev->errmsg); + dev->dev_errno = dev->free_space_errno; + return false; + } + + if ((dev->is_freespace_ok() && (dev->part_size + block->binbuf) >= dev->free_space)) { + char ed1[50], ed2[50]; + Dmsg0(10, "==== Just enough free space on the device to write the current part...\n"); + Jmsg(jcr, M_INFO, 0, _("End of Volume \"%s\" at %u:%u on device %s " + "(part_size=%s, free_space=%s, free_space_errno=%d).\n"), + dev->VolCatInfo.VolCatName, + dev->file, dev->block_num, dev->print_name(), + edit_uint64_with_commas(dev->part_size, ed1), edit_uint64_with_commas(dev->free_space, ed2), + dev->free_space_errno); + terminate_writing_volume(dcr); + dev->dev_errno = ENOSPC; + return false; + } + return true; +} + /* * Read block with locking @@ -779,14 +897,14 @@ bail_out: */ bool read_block_from_device(DCR *dcr, bool check_block_numbers) { - bool stat; + bool ok; DEVICE *dev = dcr->dev; Dmsg0(200, "Enter read_block_from_device\n"); lock_device(dev); - stat = read_block_from_dev(dcr, check_block_numbers); + ok = read_block_from_dev(dcr, check_block_numbers); unlock_device(dev); Dmsg0(200, "Leave read_block_from_device\n"); - return stat; + return ok; } /* @@ -803,102 +921,115 @@ bool read_block_from_dev(DCR *dcr, bool check_block_numbers) JCR *jcr = dcr->jcr; DEVICE *dev = dcr->dev; DEV_BLOCK *block = dcr->block; + + ASSERT(dev->is_open()); - if (dev_state(dev, ST_EOT)) { + if (dev->at_eot()) { return false; } looping = 0; - Dmsg1(200, "Full read() in read_block_from_device() len=%d\n", - block->buf_len); + Dmsg1(200, "Full read in read_block_from_device() len=%d\n", + block->buf_len); reread: if (looping > 1) { dev->dev_errno = EIO; Mmsg1(dev->errmsg, _("Block buffer size looping problem on device %s\n"), - dev->dev_name); + dev->print_name()); Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg); block->read_len = 0; return false; } - /*Dmsg1(200, "dev->file_size=%u\n",(unsigned int)dev->file_size); - Dmsg1(200, "lseek=%u\n",(unsigned int)lseek(dev->fd, 0, SEEK_CUR)); - Dmsg1(200, "dev->part_start=%u\n",(unsigned int)dev->part_start); - Dmsg1(200, "dev->file_size-dev->part_start=%u\n",(unsigned int)dev->file_size-dev->part_start); - Dmsg1(200, "dev->part_size=%u\n", (unsigned int)dev->part_size); - Dmsg1(200, "dev->part=%u\n", (unsigned int)dev->part); - Dmsg1(200, "dev->VolCatInfo.VolCatParts=%u\n", (unsigned int)dev->VolCatInfo.VolCatParts); - Dmsg3(200, "Tests : %d %d %d\n", (dev->VolCatInfo.VolCatParts > 0), ((dev->file_size-dev->part_start) == dev->part_size), (dev->part <= dev->VolCatInfo.VolCatParts));*/ - /* Check for part file end */ - if ((dev->num_parts > 0) && - ((dev->file_size-dev->part_start) == dev->part_size) && - (dev->part < dev->num_parts)) { - if (open_next_part(dev) < 0) { - Jmsg2(dcr->jcr, M_FATAL, 0, _("Unable to open device next part %s. ERR=%s\n"), - dev_name(dev), strerror_dev(dev)); - dev->dev_errno = EIO; - return false; +// #define lots_of_debug +#ifdef lots_of_debug + if (dev->at_eof() && dev->is_dvd()) { + Dmsg1(100, "file_size=%u\n",(unsigned int)dev->file_size); + Dmsg1(100, "file_addr=%u\n",(unsigned int)dev->file_addr); + Dmsg1(100, "lseek=%u\n",(unsigned int)lseek(dev->fd, 0, SEEK_CUR)); + Dmsg1(100, "part_start=%u\n",(unsigned int)dev->part_start); + Dmsg1(100, "part_size=%u\n", (unsigned int)dev->part_size); + Dmsg2(100, "part=%u num_dvd_parts=%u\n", dev->part, dev->num_dvd_parts); + Dmsg1(100, "VolCatInfo.VolCatParts=%u\n", (unsigned int)dev->VolCatInfo.VolCatParts); + Dmsg3(100, "Tests : %d %d %d\n", (dev->VolCatInfo.VolCatParts > 0), + ((dev->file_addr-dev->part_start) == dev->part_size), + (dev->part <= dev->VolCatInfo.VolCatParts)); + } +#endif + + /* Check for DVD part file end */ + if (dev->at_eof() && dev->is_dvd() && dev->num_dvd_parts > 0 && + dev->part <= dev->num_dvd_parts) { + Dmsg0(400, "Call dvd_open_next_part\n"); + if (dvd_open_next_part(dcr) < 0) { + Jmsg3(dcr->jcr, M_FATAL, 0, _("Unable to open device part=%d %s: ERR=%s\n"), + dev->part, dev->print_name(), dev->bstrerror()); + dev->dev_errno = EIO; + return false; } } retry = 0; + errno = 0; + stat = 0; do { -// uint32_t *bp = (uint32_t *)block->buf; -// Dmsg3(000, "Read %p %u at %llu\n", block->buf, block->buf_len, lseek(dev->fd, 0, SEEK_CUR)); - - stat = read(dev->fd, block->buf, (size_t)block->buf_len); - -// Dmsg8(000, "stat=%d Csum=%u blen=%u bnum=%u %c%c%c%c\n",stat, bp[0],bp[1],bp[2], -// block->buf[12],block->buf[13],block->buf[14],block->buf[15]); - - if (retry == 1) { - dev->VolCatInfo.VolCatErrors++; + if ((retry > 0 && stat == -1 && errno == EBUSY)) { + berrno be; + Dmsg4(100, "===== read retry=%d stat=%d errno=%d: ERR=%s\n", + retry, stat, errno, be.strerror()); + bmicrosleep(10, 0); /* pause a bit if busy or lots of errors */ + dev->clrerror(-1); + } + if (dev->is_tape()) { + stat = tape_read(dev->fd, block->buf, (size_t)block->buf_len); + } else { + stat = read(dev->fd, block->buf, (size_t)block->buf_len); } - } while (stat == -1 && (errno == EINTR || errno == EIO) && retry++ < 11); + } while (stat == -1 && (errno == EBUSY || errno == EINTR || errno == EIO) && retry++ < 3); if (stat < 0) { berrno be; - clrerror_dev(dev, -1); + dev->clrerror(-1); Dmsg1(200, "Read device got: ERR=%s\n", be.strerror()); block->read_len = 0; - Mmsg4(dev->errmsg, _("Read error at file:blk %u:%u on device %s. ERR=%s.\n"), - dev->file, dev->block_num, dev->dev_name, be.strerror()); + Mmsg5(dev->errmsg, _("Read error on fd=%d at file:blk %u:%u on device %s. ERR=%s.\n"), + dev->fd, dev->file, dev->block_num, dev->print_name(), be.strerror()); Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg); - if (dev->at_eof()) { /* EOF just seen? */ - dev->state |= ST_EOT; /* yes, error => EOT */ + if (dev->at_eof()) { /* EOF just seen? */ + dev->set_eot(); /* yes, error => EOT */ } return false; } Dmsg3(200, "Read device got %d bytes at %u:%u\n", stat, dev->file, dev->block_num); - if (stat == 0) { /* Got EOF ! */ + if (stat == 0) { /* Got EOF ! */ dev->block_num = 0; block->read_len = 0; Mmsg3(dev->errmsg, _("Read zero bytes at %u:%u on device %s.\n"), - dev->file, dev->block_num, dev->dev_name); - if (dev->at_eof()) { /* EOF already read? */ - dev->state |= ST_EOT; /* yes, 2 EOFs => EOT */ - return 0; + dev->file, dev->block_num, dev->print_name()); + if (dev->at_eof()) { /* EOF already read? */ + dev->set_eot(); /* yes, 2 EOFs => EOT */ + return 0; } - dev->set_eof(); - return false; /* return eof */ + dev->set_ateof(); + return false; /* return eof */ } /* Continue here for successful read */ - block->read_len = stat; /* save length read */ + block->read_len = stat; /* save length read */ if (block->read_len < BLKHDR2_LENGTH) { dev->dev_errno = EIO; Mmsg4(dev->errmsg, _("Volume data error at %u:%u! Very short block of %d bytes on device %s discarded.\n"), - dev->file, dev->block_num, block->read_len, dev->dev_name); + dev->file, dev->block_num, block->read_len, dev->print_name()); Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg); - dev->state |= ST_SHORT; /* set short block */ + dev->set_short_block(); block->read_len = block->binbuf = 0; - return false; /* return error */ + return false; /* return error */ } BlockNumber = block->BlockNumber + 1; if (!unser_block_header(jcr, dev, block)) { if (forge_on) { - dev->file_addr += block->read_len; - dev->file_size += block->read_len; - goto reread; + dev->file_addr += block->read_len; + dev->file_size += block->read_len; + goto reread; } return false; } @@ -911,23 +1042,23 @@ reread: if (block->block_len > block->buf_len) { dev->dev_errno = EIO; Mmsg2(dev->errmsg, _("Block length %u is greater than buffer %u. Attempting recovery.\n"), - block->block_len, block->buf_len); + block->block_len, block->buf_len); Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg); Pmsg1(000, "%s", dev->errmsg); /* Attempt to reposition to re-read the block */ - if (dev->state & ST_TAPE) { + if (dev->is_tape()) { Dmsg0(200, "BSR for reread; block too big for buffer.\n"); - if (!bsr_dev(dev, 1)) { - Jmsg(jcr, M_ERROR, 0, "%s", strerror_dev(dev)); - block->read_len = 0; - return false; - } + if (!dev->bsr(1)) { + Jmsg(jcr, M_ERROR, 0, "%s", dev->bstrerror()); + block->read_len = 0; + return false; + } } else { Dmsg0(200, "Seek to beginning of block for reread.\n"); - off_t pos = lseek_dev(dev, (off_t)0, SEEK_CUR); /* get curr pos */ - pos -= block->read_len; - lseek_dev(dev, pos, SEEK_SET); - dev->file_addr = pos; + boffset_t pos = dev->lseek(dcr, (boffset_t)0, SEEK_CUR); /* get curr pos */ + pos -= block->read_len; + dev->lseek(dcr, pos, SEEK_SET); + dev->file_addr = pos; } Mmsg1(dev->errmsg, _("Setting block buffer size to %u bytes.\n"), block->block_len); Jmsg(jcr, M_INFO, 0, "%s", dev->errmsg); @@ -939,41 +1070,46 @@ reread: block->buf = get_memory(block->buf_len); empty_block(block); looping++; - goto reread; /* re-read block with correct block size */ + goto reread; /* re-read block with correct block size */ } if (block->block_len > block->read_len) { dev->dev_errno = EIO; Mmsg4(dev->errmsg, _("Volume data error at %u:%u! Short block of %d bytes on device %s discarded.\n"), - dev->file, dev->block_num, block->read_len, dev->dev_name); + dev->file, dev->block_num, block->read_len, dev->print_name()); Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg); - dev->state |= ST_SHORT; /* set short block */ + dev->set_short_block(); block->read_len = block->binbuf = 0; - return false; /* return error */ + return false; /* return error */ } - dev->state &= ~(ST_EOF|ST_SHORT); /* clear EOF and short block */ + dev->clear_short_block(); + dev->clear_eof(); dev->VolCatInfo.VolCatReads++; dev->VolCatInfo.VolCatRBytes += block->read_len; dev->VolCatInfo.VolCatBytes += block->block_len; dev->VolCatInfo.VolCatBlocks++; + if (dev->VolCatInfo.VolFirstWritten == 0) { + dev->VolCatInfo.VolFirstWritten = (utime_t)time(NULL); /* Set first written time */ + } dev->EndBlock = dev->block_num; dev->EndFile = dev->file; dev->block_num++; /* Update dcr values */ - if (dev->state & ST_TAPE) { + if (dev->is_tape()) { dcr->EndBlock = dev->EndBlock; dcr->EndFile = dev->EndFile; } else { - dcr->EndBlock = (uint32_t)dev->file_addr; - dcr->EndFile = (uint32_t)(dev->file_addr >> 32); + uint64_t addr = dev->file_addr + block->read_len - 1; + dcr->EndBlock = (uint32_t)addr; + dcr->EndFile = (uint32_t)(addr >> 32); dev->block_num = dcr->EndBlock; dev->file = dcr->EndFile; } - dev->file_addr += block->block_len; - dev->file_size += block->block_len; + dev->file_addr += block->read_len; + dev->file_size += block->read_len; /* * If we read a short block on disk, @@ -983,20 +1119,21 @@ reread: * it should only happen once at the end of each job. * * I've been lseek()ing negative relative to SEEK_CUR for 30 - * years now. However, it seems that with the new off_t definition, - * it is not possible to seek negative amounts, so we use two - * lseek(). One to get the position, then the second to do an - * absolute positioning -- so much for efficiency. KES Sep 02. + * years now. However, it seems that with the new off_t definition, + * it is not possible to seek negative amounts, so we use two + * lseek(). One to get the position, then the second to do an + * absolute positioning -- so much for efficiency. KES Sep 02. */ Dmsg0(200, "At end of read block\n"); if (block->read_len > block->block_len && !dev->is_tape()) { char ed1[50]; - off_t pos = lseek_dev(dev, (off_t)0, SEEK_CUR); /* get curr pos */ + boffset_t pos = dev->lseek(dcr, (boffset_t)0, SEEK_CUR); /* get curr pos */ + Dmsg1(200, "Current lseek pos=%s\n", edit_int64(pos, ed1)); pos -= (block->read_len - block->block_len); - lseek_dev(dev, pos, SEEK_SET); + dev->lseek(dcr, pos, SEEK_SET); Dmsg3(200, "Did lseek pos=%s blk_size=%d rdlen=%d\n", - edit_uint64(pos, ed1), block->block_len, - block->read_len); + edit_int64(pos, ed1), block->block_len, + block->read_len); dev->file_addr = pos; dev->file_size = pos; }