+/*
+ Bacula® - The Network Backup Solution
+
+ Copyright (C) 2001-2014 Free Software Foundation Europe e.V.
+
+ The main author of Bacula is Kern Sibbald, with contributions from many
+ others, a complete list can be found in the file AUTHORS.
+
+ You may use this file and others of this release according to the
+ license defined in the LICENSE file, which includes the Affero General
+ Public License, v3.0 ("AGPLv3") and some additional permissions and
+ terms pursuant to its AGPLv3 Section 7.
+
+ Bacula® is a registered trademark of Kern Sibbald.
+*/
/*
*
* block.c -- tape block handling functions
* Kern Sibbald, March MMI
* added BB02 format October MMII
*
- * Version $Id$
- *
- */
-/*
- Copyright (C) 2001-2006 Kern Sibbald
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- version 2 as amended with additional clauses defined in the
- file LICENSE in the main source directory.
-
- 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
- the file LICENSE for additional details.
-
*/
#include "bacula.h"
#include "stored.h"
-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
- * the block printing out the record headers.
- */
-void dump_block(DEV_BLOCK *b, const char *msg)
-{
- ser_declare;
- char *p;
- char Id[BLKHDR_ID_LENGTH+1];
- uint32_t CheckSum, BlockCheckSum;
- uint32_t block_len;
- uint32_t BlockNumber;
- uint32_t VolSessionId, VolSessionTime, data_len;
- int32_t FileIndex;
- int32_t Stream;
- int bhl, rhl;
- char buf1[100], buf2[100];
-
- unser_begin(b->buf, BLKHDR1_LENGTH);
- unser_uint32(CheckSum);
- unser_uint32(block_len);
- unser_uint32(BlockNumber);
- unser_bytes(Id, BLKHDR_ID_LENGTH);
- ASSERT(unser_length(b->buf) == BLKHDR1_LENGTH);
- Id[BLKHDR_ID_LENGTH] = 0;
- if (Id[3] == '2') {
- unser_uint32(VolSessionId);
- unser_uint32(VolSessionTime);
- bhl = BLKHDR2_LENGTH;
- rhl = RECHDR2_LENGTH;
- } else {
- VolSessionId = VolSessionTime = 0;
- bhl = BLKHDR1_LENGTH;
- rhl = RECHDR1_LENGTH;
- }
-
- if (block_len > 100000) {
- Dmsg3(20, "Dump block %s 0x%x blocksize too big %u\n", msg, b, block_len);
- return;
- }
-
- 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"),
- 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_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(buf1, FileIndex),
- stream_to_ascii(buf2, Stream, FileIndex), data_len, p);
- p += data_len + rhl;
- }
-}
-
-/*
- * Create a new block structure.
- * We pass device so that the block can inherit the
- * min and max block sizes.
- */
-DEV_BLOCK *new_block(DEVICE *dev)
-{
- DEV_BLOCK *block = (DEV_BLOCK *)get_memory(sizeof(DEV_BLOCK));
-
- memset(block, 0, sizeof(DEV_BLOCK));
-
- /* If the user has specified a max_block_size, use it as the default */
- if (dev->max_block_size == 0) {
- block->buf_len = DEFAULT_BLOCK_SIZE;
- } else {
- block->buf_len = dev->max_block_size;
- }
- block->dev = dev;
- block->block_len = block->buf_len; /* default block size */
- block->buf = get_memory(block->buf_len);
- empty_block(block);
- block->BlockVer = BLOCK_VER; /* default write version */
- Dmsg1(650, "Returning new block=%x\n", block);
- return block;
-}
-
-
-/*
- * Duplicate an existing block (eblock)
- */
-DEV_BLOCK *dup_block(DEV_BLOCK *eblock)
-{
- DEV_BLOCK *block = (DEV_BLOCK *)get_memory(sizeof(DEV_BLOCK));
- int buf_len = sizeof_pool_memory(eblock->buf);
-
- memcpy(block, eblock, sizeof(DEV_BLOCK));
- block->buf = get_memory(buf_len);
- memcpy(block->buf, eblock->buf, buf_len);
- return block;
-}
-
-
-/*
- * Only the first block checksum error was reported.
- * If there are more, report it now.
- */
-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);
- }
-}
-
-/*
- * Free block
- */
-void free_block(DEV_BLOCK *block)
-{
- Dmsg1(999, "free_block buffer %x\n", block->buf);
- free_memory(block->buf);
- Dmsg1(999, "free_block block %x\n", block);
- free_memory((POOLMEM *)block);
-}
-
-/* Empty the block -- for writing */
-void empty_block(DEV_BLOCK *block)
-{
- block->binbuf = WRITE_BLKHDR_LENGTH;
- block->bufp = block->buf + block->binbuf;
- block->read_len = 0;
- block->write_failed = false;
- block->block_read = false;
- block->FirstIndex = block->LastIndex = 0;
-}
-
-/*
- * Create block header just before write. The space
- * in the buffer should have already been reserved by
- * init_block.
- */
-void ser_block_header(DEV_BLOCK *block)
-{
- ser_declare;
- uint32_t CheckSum = 0;
- uint32_t block_len = block->binbuf;
-
- Dmsg1(1390, "ser_block_header: block_len=%d\n", block_len);
- ser_begin(block->buf, BLKHDR2_LENGTH);
- ser_uint32(CheckSum);
- ser_uint32(block_len);
- ser_uint32(block->BlockNumber);
- ser_bytes(WRITE_BLKHDR_ID, BLKHDR_ID_LENGTH);
- if (BLOCK_VER >= 2) {
- ser_uint32(block->VolSessionId);
- ser_uint32(block->VolSessionTime);
- }
-
- /* Checksum whole block except for the checksum */
- CheckSum = bcrc32((uint8_t *)block->buf+BLKHDR_CS_LENGTH,
- 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 */
-}
-
-/*
- * Unserialize the block header for reading block.
- * This includes setting all the buffer pointers correctly.
- *
- * Returns: false on failure (not a block)
- * true on success
- */
-static bool unser_block_header(JCR *jcr, DEVICE *dev, DEV_BLOCK *block)
-{
- ser_declare;
- char Id[BLKHDR_ID_LENGTH+1];
- uint32_t CheckSum, BlockCheckSum;
- uint32_t block_len;
- uint32_t block_end;
- uint32_t BlockNumber;
- int bhl;
-
- unser_begin(block->buf, BLKHDR_LENGTH);
- unser_uint32(CheckSum);
- unser_uint32(block_len);
- unser_uint32(BlockNumber);
- unser_bytes(Id, BLKHDR_ID_LENGTH);
- ASSERT(unser_length(block->buf) == BLKHDR1_LENGTH);
+#ifdef DEBUG_BLOCK_CHECKSUM
+static const bool debug_block_checksum = true;
+#else
+static const bool debug_block_checksum = false;
+#endif
- Id[BLKHDR_ID_LENGTH] = 0;
- if (Id[3] == '1') {
- bhl = BLKHDR1_LENGTH;
- block->BlockVer = 1;
- block->bufp = block->buf + bhl;
- if (strncmp(Id, BLKHDR1_ID, BLKHDR_ID_LENGTH) != 0) {
- 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) {
- Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg);
- }
- block->read_errors++;
- return false;
- }
- } else if (Id[3] == '2') {
- unser_uint32(block->VolSessionId);
- unser_uint32(block->VolSessionTime);
- bhl = BLKHDR2_LENGTH;
- block->BlockVer = 2;
- block->bufp = block->buf + bhl;
- if (strncmp(Id, BLKHDR2_ID, BLKHDR_ID_LENGTH) != 0) {
- 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) {
- Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg);
- }
- 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);
- if (block->read_errors == 0 || verbose >= 2) {
- Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg);
- }
- block->read_errors++;
- unser_uint32(block->VolSessionId);
- unser_uint32(block->VolSessionTime);
- return false;
- }
+#ifdef NO_TAPE_WRITE_TEST
+static const bool no_tape_write_test = true;
+#else
+static const bool no_tape_write_test = false;
+#endif
- /* Sanity check */
- 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);
- if (block->read_errors == 0 || verbose >= 2) {
- Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg);
- }
- block->read_errors++;
- return false;
- }
- Dmsg1(390, "unser_block_header block_len=%d\n", block_len);
- /* Find end of block or end of buffer whichever is smaller */
- if (block_len > block->read_len) {
- block_end = block->read_len;
- } else {
- block_end = block_len;
- }
- block->binbuf = block_end - bhl;
- block->block_len = block_len;
- block->BlockNumber = BlockNumber;
- Dmsg3(390, "Read binbuf = %d %d block_len=%d\n", block->binbuf,
- bhl, block_len);
- if (block_len <= block->read_len) {
- BlockCheckSum = bcrc32((uint8_t *)block->buf+BLKHDR_CS_LENGTH,
- block_len-BLKHDR_CS_LENGTH);
- if (BlockCheckSum != CheckSum) {
- 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) {
- Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg);
- }
- block->read_errors++;
- if (!forge_on) {
- return false;
- }
- }
- }
- return true;
-}
+bool do_new_file_bookkeeping(DCR *dcr);
+//bool do_dvd_size_checks(DCR *dcr);
+void reread_last_block(DCR *dcr);
+uint32_t get_len_and_clear_block(DEV_BLOCK *block, DEVICE *dev, uint32_t &pad);
+uint32_t ser_block_header(DEV_BLOCK *block, bool do_checksum);
+bool unser_block_header(JCR *jcr, DEVICE *dev, DEV_BLOCK *block);
/*
* Write a block to the device, with locking and unlocking
* : false on failure
*
*/
-bool write_block_to_device(DCR *dcr)
+bool DCR::write_block_to_device()
{
bool stat = true;
- DEVICE *dev = dcr->dev;
- JCR *jcr = dcr->jcr;
+ DCR *dcr = this;
if (dcr->spooling) {
+ Dmsg0(200, "Write to spool\n");
stat = write_block_to_spool_file(dcr);
return stat;
}
- if (!dcr->dev_locked) {
- lock_device(dev);
+ if (!is_dev_locked()) { /* device already locked? */
+ /* note, do not change this to dcr->rLock */
+ dev->rLock(false); /* 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
- * 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;
- }
- /* Create a jobmedia record for this job */
- if (!dir_create_jobmedia_record(dcr)) {
- 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);
+ if (!check_for_newvol_or_newfile(dcr)) {
+ stat = false;
+ goto bail_out; /* fatal error */
+ }
+
+ Dmsg1(500, "Write block to dev=%p\n", dcr->dev);
+ if (!write_block_to_dev()) {
+ if (job_canceled(jcr) || jcr->getJobType() == JT_SYSTEM) {
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 */
+ Dmsg2(40, "cancel=%d or SYSTEM=%d\n", job_canceled(jcr),
+ jcr->getJobType() == JT_SYSTEM);
} else {
- set_new_file_parameters(dcr);
+ Dmsg0(40, "Calling fixup_device ...\n");
+ stat = fixup_device_block_write_error(dcr);
}
}
- if (!write_block_to_dev(dcr)) {
- if (job_canceled(jcr) || jcr->JobType == JT_SYSTEM) {
- stat = false;
- } else {
- stat = fixup_device_block_write_error(dcr);
- }
- }
-
bail_out:
- if (!dcr->dev_locked) {
- unlock_device(dev);
+ if (!dcr->is_dev_locked()) { /* did we lock dev above? */
+ /* note, do not change this to dcr->dunlock */
+ dev->Unlock(); /* unlock it now */
}
return stat;
}
* Returns: true on success or EOT
* false on hard error
*/
-bool write_block_to_dev(DCR *dcr)
+bool DCR::write_block_to_dev()
{
ssize_t stat = 0;
uint32_t wlen; /* length to write */
- int hit_max1, hit_max2;
bool ok = true;
- DEVICE *dev = dcr->dev;
- JCR *jcr = dcr->jcr;
- DEV_BLOCK *block = dcr->block;
+ DCR *dcr = this;
+ uint32_t checksum;
+ uint32_t pad; /* padding or zeros written */
-#ifdef NO_TAPE_WRITE_TEST
- empty_block(block);
- return true;
-#endif
- ASSERT(block->binbuf == ((uint32_t) (block->bufp - block->buf)));
- ASSERT(dev->is_open());
+ if (no_tape_write_test) {
+ empty_block(block);
+ return true;
+ }
+ if (job_canceled(jcr)) {
+ return false;
+ }
+
+ Dmsg3(200, "fd=%d bufp-buf=%d binbuf=%d\n", dev->fd(),
+ block->bufp-block->buf, block->binbuf);
+ ASSERT2(block->binbuf == ((uint32_t)(block->bufp - block->buf)), "binbuf badly set");
- /* dump_block(block, "before write"); */
+ if (is_block_empty(block)) { /* Does block have data in it? */
+ Dmsg0(150, "return write_block_to_dev no data to write\n");
+ return true;
+ }
+
+ dump_block(block, "before write");
if (dev->at_weot()) {
- Dmsg0(100, "return write_block_to_dev with ST_WEOT\n");
+ Dmsg0(50, "==== FATAL: At EOM with ST_WEOT.\n");
dev->dev_errno = ENOSPC;
- Jmsg(jcr, M_FATAL, 0, _("Cannot write block. Device at EOM.\n"));
+ Jmsg1(jcr, M_FATAL, 0, _("Cannot write block. Device at EOM. dev=%s\n"), dev->print_name());
return false;
}
if (!dev->can_append()) {
dev->dev_errno = EIO;
- Jmsg(jcr, M_FATAL, 0, _("Attempt to write on read-only Volume.\n"));
+ Jmsg1(jcr, M_FATAL, 0, _("Attempt to write on read-only Volume. dev=%s\n"), dev->print_name());
+ Dmsg1(50, "Attempt to write on read-only Volume. dev=%s\n", dev->print_name());
return false;
}
- wlen = block->binbuf;
- if (wlen <= WRITE_BLKHDR_LENGTH) { /* Does block have data in it? */
- Dmsg0(100, "return write_block_to_dev no data to write\n");
- return true;
- }
- /*
- * Clear to the end of the buffer if it is not full,
- * and on tape devices, apply min and fixed blocking.
- */
- if (wlen != block->buf_len) {
- 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->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 */
- }
+ if (!dev->is_open()) {
+ Jmsg1(jcr, M_FATAL, 0, _("Attempt to write on closed device=%s\n"), dev->print_name());
+ Dmsg1(50, "Attempt to write on closed device=%s\n", dev->print_name());
+ return false;
}
- ser_block_header(block);
+ wlen = get_len_and_clear_block(block, dev, pad);
+ block->block_len = wlen;
- /* Limit maximum Volume size to value specified by user */
- hit_max1 = (dev->max_volume_size > 0) &&
- ((dev->VolCatInfo.VolCatBytes + block->binbuf)) >= dev->max_volume_size;
- hit_max2 = (dev->VolCatInfo.VolCatMaxBytes > 0) &&
- ((dev->VolCatInfo.VolCatBytes + block->binbuf)) >= dev->VolCatInfo.VolCatMaxBytes;
- if (hit_max1 || hit_max2) {
- char ed1[50];
- uint64_t max_cap;
- Dmsg0(10, "==== Output bytes Triggered medium max capacity.\n");
- if (hit_max1) {
- max_cap = dev->max_volume_size;
- } else {
- 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->print_name());
+ checksum = ser_block_header(block, dev->do_checksum());
+
+ /* Handle max vol size here */
+ if (user_volume_size_reached(dcr, true)) {
+ Dmsg0(40, "Calling terminate_writing_volume\n");
terminate_writing_volume(dcr);
- reread_last_block(dcr); /* DEBUG */
+ reread_last_block(dcr); /* Only used on tapes */
dev->dev_errno = ENOSPC;
return false;
}
- /* Limit maximum File size on volume to user specified value */
+ /*
+ * Limit maximum File size on volume to user specified value.
+ * In practical terms, this means to put an EOF mark on
+ * a tape after every X bytes. This effectively determines
+ * how many index records we have (JobMedia). If you set
+ * max_file_size too small, it will cause a lot of shoe-shine
+ * on very fast modern tape (LTO-3 and above).
+ */
if ((dev->max_file_size > 0) &&
(dev->file_size+block->binbuf) >= dev->max_file_size) {
dev->file_size = 0; /* reset file size */
if (!dev->weof(1)) { /* write eof */
- Dmsg0(190, "WEOF error in max file size.\n");
- Jmsg(jcr, M_FATAL, 0, _("Unable to write EOF. ERR=%s\n"),
+ Dmsg0(50, "WEOF error in max file size.\n");
+ Jmsg(jcr, M_FATAL, 0, _("Unable to write EOF. ERR=%s\n"),
dev->bstrerror());
+ Dmsg0(40, "Calling terminate_writing_volume\n");
terminate_writing_volume(dcr);
dev->dev_errno = ENOSPC;
return false;
return false;
}
}
-
- if (!do_dvd_size_checks(dcr)) {
- /* Error message already sent */
- return false;
- }
- dev->VolCatInfo.VolCatWrites++;
- Dmsg1(1300, "Write block of %u bytes\n", wlen);
+ dev->updateVolCatWrites(1);
+
#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) {
#endif
/*
- * Do write here, make a somewhat feeble attempt to recover from
+ * 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;
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());
+ retry, stat, errno, be.bstrerror());
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);
- }
+ stat = dev->write(block->buf, (size_t)wlen);
+ Dmsg4(110, "Write() BlockAddr=%lld NextAddr=%lld Vol=%s wlen=%d\n",
+ block->BlockAddr, dev->lseek(dcr, 0, SEEK_CUR),
+ dev->VolHdr.VolumeName, wlen);
} while (stat == -1 && (errno == EBUSY || errno == EIO) && retry++ < 3);
+ if (debug_block_checksum) {
+ uint32_t achecksum = ser_block_header(block, dev->do_checksum());
+ if (checksum != achecksum) {
+ Jmsg2(jcr, M_ERROR, 0, _("Block checksum changed during write: before=%ud after=%ud\n"),
+ checksum, achecksum);
+ dump_block(block, "with checksum error");
+ }
+ }
+
#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"));
*/
if (stat == -1) {
berrno be;
- dev->clrerror(-1);
+ dev->clrerror(-1); /* saves errno in dev->dev_errno */
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->print_name(), be.strerror());
+ dev->file, dev->block_num, dev->print_name(), be.bstrerror());
}
} else {
dev->dev_errno = ENOSPC; /* out of space */
}
if (dev->dev_errno == ENOSPC) {
+ dev->clear_nospace();
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->getVolCatName(),
dev->file, dev->block_num, dev->print_name(), wlen, stat);
}
- 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));
+ if (chk_dbglvl(100)) {
+ berrno be;
+ Dmsg7(90, "==== 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, be.bstrerror(dev->dev_errno));
+ }
+ Dmsg0(40, "Calling terminate_writing_volume\n");
ok = terminate_writing_volume(dcr);
- if (!ok && !forge_on) {
- return false;
- }
if (ok) {
reread_last_block(dcr);
}
}
/* We successfully wrote the block, now do housekeeping */
- Dmsg2(1300, "VolCatBytes=%d newVolCatBytes=%d\n", (int)dev->VolCatInfo.VolCatBytes,
- (int)(dev->VolCatInfo.VolCatBytes+wlen));
- dev->VolCatInfo.VolCatBytes += wlen;
- dev->VolCatInfo.VolCatBlocks++;
+ Dmsg2(1300, "VolCatBytes=%lld newVolCatBytes=%lld\n", dev->VolCatInfo.VolCatBytes,
+ (dev->VolCatInfo.VolCatBytes+wlen));
+ dev->updateVolCatBytes(wlen);
+ Dmsg2(200, "AmetaBytes=%lld Bytes=%lld\n",
+ dev->VolCatInfo.VolCatAmetaBytes, dev->VolCatInfo.VolCatBytes);
+ dev->updateVolCatBlocks(1);
dev->EndBlock = dev->block_num;
dev->EndFile = dev->file;
+ dev->LastBlock = block->BlockNumber;
block->BlockNumber++;
/* Update dcr values */
} else {
/* Save address of block just written */
uint64_t addr = dev->file_addr + wlen - 1;
+ if (dcr->EndBlock > (uint32_t)addr ||
+ dcr->EndFile > (uint32_t)(addr >> 32)) {
+ Pmsg4(000, "Incorrect EndBlock/EndFile oldEndBlock=%d newEndBlock=%d oldEndFile=%d newEndFile=%d\n",
+ dcr->EndBlock, (uint32_t)addr, dcr->EndFile, (uint32_t)(addr >> 32));
+ }
dcr->EndBlock = (uint32_t)addr;
dcr->EndFile = (uint32_t)(addr >> 32);
- dev->block_num = dcr->EndBlock;
- dev->file = dcr->EndFile;
- }
+ dev->block_num = (uint32_t)addr;
+ dev->file = (uint32_t)(addr >> 32);
+ block->BlockAddr = dev->file_addr + wlen;
+ Dmsg3(150, "Set block->BlockAddr=%lld wlen=%d block=%x\n",
+ block->BlockAddr, wlen, block);
+ Dmsg2(200, "AmetaBytes=%lld Bytes=%lld\n",
+ dev->VolCatInfo.VolCatAmetaBytes, dev->VolCatInfo.VolCatBytes);
+ }
+ dcr->VolMediaId = dev->VolCatInfo.VolMediaId;
+ Dmsg3(150, "VolFirstIndex=%d blockFirstIndex=%d Vol=%s\n",
+ dcr->VolFirstIndex, block->FirstIndex, dcr->VolumeName);
if (dcr->VolFirstIndex == 0 && block->FirstIndex > 0) {
dcr->VolFirstIndex = block->FirstIndex;
}
dev->file_addr += wlen; /* update file address */
dev->file_size += wlen;
dev->part_size += wlen;
+ dev->setVolCatInfo(false); /* Needs update */
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_cap(dev, 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;
- bool ok = true;
-
- /* Create a JobMedia record to indicated end of tape */
- dev->VolCatInfo.VolCatFiles = dev->file;
- if (!dir_create_jobmedia_record(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);
- ok = false;
- goto bail_out;
- }
- dcr->block->write_failed = true;
- if (!dev->weof(1)) { /* end the tape */
- dev->VolCatInfo.VolCatErrors++;
- 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");
- }
- 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()) {
- 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)) {
- ok = false;
- }
- 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.
- */
- 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);
-
- if (ok && dev_cap(dev, 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->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;
- }
- }
-
- if (!dev->is_freespace_ok()) {
- update_free_space_dev(dev);
- }
-
- 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
*
*/
-bool read_block_from_device(DCR *dcr, bool check_block_numbers)
+bool DCR::read_block_from_device(bool check_block_numbers)
{
bool ok;
- DEVICE *dev = dcr->dev;
- Dmsg0(200, "Enter read_block_from_device\n");
- lock_device(dev);
- ok = read_block_from_dev(dcr, check_block_numbers);
- unlock_device(dev);
- Dmsg0(200, "Leave read_block_from_device\n");
+
+ Dmsg0(250, "Enter read_block_from_device\n");
+ dev->rLock(false);
+ ok = read_block_from_dev(check_block_numbers);
+ dev->rUnlock();
+ Dmsg0(250, "Leave read_block_from_device\n");
return ok;
}
* the block header. For a file, the block may be partially
* or completely in the current buffer.
*/
-bool read_block_from_dev(DCR *dcr, bool check_block_numbers)
+bool DCR::read_block_from_dev(bool check_block_numbers)
{
ssize_t stat;
int looping;
- uint32_t BlockNumber;
int retry;
- JCR *jcr = dcr->jcr;
- DEVICE *dev = dcr->dev;
- DEV_BLOCK *block = dcr->block;
+ DCR *dcr = this;
+
+ if (job_canceled(jcr)) {
+ Mmsg(dev->errmsg, _("Job failed or canceled.\n"));
+ block->read_len = 0;
+ return false;
+ }
- ASSERT(dev->is_open());
-
if (dev->at_eot()) {
+ Mmsg(dev->errmsg, _("Attempt to read past end of tape or file.\n"));
+ block->read_len = 0;
return false;
}
looping = 0;
- Dmsg1(200, "Full read in read_block_from_device() len=%d\n",
- block->buf_len);
+ Dmsg1(250, "Full read in read_block_from_device() len=%d\n", block->buf_len);
+
+ if (!dev->is_open()) {
+ Mmsg4(dev->errmsg, _("Attempt to read closed device: fd=%d at file:blk %u:%u on device %s\n"),
+ dev->fd(), dev->file, dev->block_num, dev->print_name());
+ Jmsg(dcr->jcr, M_FATAL, 0, "%s", dev->errmsg);
+ Pmsg2(000, "Fatal: dev=%p dcr=%p\n", dev, dcr);
+ Pmsg1(000, "%s", dev->errmsg);
+ block->read_len = 0;
+ return false;
+ }
+
reread:
if (looping > 1) {
dev->dev_errno = EIO;
block->read_len = 0;
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;
- }
- }
-
+ dump_block(block, "before read");
+
retry = 0;
errno = 0;
stat = 0;
+
+ boffset_t pos = dev->lseek(dcr, (boffset_t)0, SEEK_CUR); /* get curr pos */
do {
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());
+ retry, stat, errno, be.bstrerror());
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);
- }
+ stat = dev->read(block->buf, (size_t)block->buf_len);
+
} while (stat == -1 && (errno == EBUSY || errno == EINTR || errno == EIO) && retry++ < 3);
+ Dmsg3(110, "Read() vol=%s nbytes=%d addr=%lld\n",
+ dev->VolHdr.VolumeName, stat, pos);
if (stat < 0) {
berrno be;
dev->clrerror(-1);
- Dmsg1(200, "Read device got: ERR=%s\n", be.strerror());
+ Dmsg2(90, "Read device fd=%d got: ERR=%s\n", dev->fd(), be.bstrerror());
block->read_len = 0;
- 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());
+ if (dev->file == 0 && dev->block_num == 0) { /* Attempt to read label */
+ Mmsg(dev->errmsg, _("The Volume=%s on device=%s appears to be unlabeled.\n"),
+ dev->VolCatInfo.VolCatName, dev->print_name());
+ } else {
+ 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.bstrerror());
+ }
Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg);
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 (dev->file == 0 && dev->block_num == 0) { /* Attempt to read label */
+ Mmsg2(dev->errmsg, _("The Volume=%s on device=%s appears to be unlabeled.\n"),
+ dev->VolCatInfo.VolCatName, dev->print_name());
+ } else {
+ Mmsg3(dev->errmsg, _("Read zero bytes Vol=%s at %lld on device %s.\n"),
+ dev->VolCatInfo.VolCatName, pos, dev->print_name());
+ }
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->print_name());
+ Dmsg1(100, "%s", dev->errmsg);
if (dev->at_eof()) { /* EOF already read? */
dev->set_eot(); /* yes, 2 EOFs => EOT */
- return 0;
+ return false;
}
dev->set_ateof();
+ Dmsg2(150, "==== Read zero bytes. vol=%s at %lld\n", dev->VolCatInfo.VolCatName, pos);
return false; /* return eof */
}
+
/* Continue here for successful read */
+
block->read_len = stat; /* save length read */
+ if (block->read_len == 80 &&
+ (dcr->VolCatInfo.LabelType != B_BACULA_LABEL ||
+ dcr->device->label_type != B_BACULA_LABEL)) {
+ /* ***FIXME*** should check label */
+ Dmsg2(100, "Ignore 80 byte ANSI label at %u:%u\n", dev->file, dev->block_num);
+ dev->clear_eof();
+ goto reread; /* skip ANSI/IBM label */
+ }
+
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->print_name());
Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg);
- dev->set_short_block();
+ dev->set_short_block();
block->read_len = block->binbuf = 0;
+ Dmsg2(50, "set block=%p binbuf=%d\n", block, block->binbuf);
return false; /* return error */
}
- BlockNumber = block->BlockNumber + 1;
+ //BlockNumber = block->BlockNumber + 1;
if (!unser_block_header(jcr, dev, block)) {
if (forge_on) {
dev->file_addr += block->read_len;
* re-reading the block, allocate a buffer of the correct size,
* and go re-read.
*/
+ Dmsg2(150, "block_len=%d buf_len=%d\n", block->block_len, block->buf_len);
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"),
Pmsg1(000, "%s", dev->errmsg);
/* Attempt to reposition to re-read the block */
if (dev->is_tape()) {
- Dmsg0(200, "BSR for reread; block too big for buffer.\n");
+ Dmsg0(250, "BSR for reread; block too big for buffer.\n");
if (!dev->bsr(1)) {
- Jmsg(jcr, M_ERROR, 0, "%s", dev->bstrerror());
+ Mmsg(dev->errmsg, "%s", dev->bstrerror());
+ Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg);
block->read_len = 0;
return false;
}
} else {
- Dmsg0(200, "Seek to beginning of block for reread.\n");
- off_t pos = dev->lseek(dcr, (off_t)0, SEEK_CUR); /* get curr pos */
+ Dmsg0(250, "Seek to beginning of block for reread.\n");
+ 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;
dev->clear_short_block();
dev->clear_eof();
- dev->VolCatInfo.VolCatReads++;
- dev->VolCatInfo.VolCatRBytes += block->read_len;
+ dev->updateVolCatReads(1);
+ dev->updateVolCatReadBytes(block->read_len);
- dev->VolCatInfo.VolCatBytes += block->block_len;
- dev->VolCatInfo.VolCatBlocks++;
- if (dev->VolCatInfo.VolFirstWritten == 0) {
- dev->VolCatInfo.VolFirstWritten = time(NULL); /* Set first written time */
- }
dev->EndBlock = dev->block_num;
dev->EndFile = dev->file;
dev->block_num++;
dcr->EndBlock = dev->EndBlock;
dcr->EndFile = dev->EndFile;
} else {
- uint64_t addr = dev->file_addr + block->read_len - 1;
+ /* We need to take care about a short block in EndBlock/File
+ * computation
+ */
+ uint32_t len = MIN(block->read_len, block->block_len);
+ uint64_t addr = dev->file_addr + len - 1;
dcr->EndBlock = (uint32_t)addr;
dcr->EndFile = (uint32_t)(addr >> 32);
- dev->block_num = dcr->EndBlock;
- dev->file = dcr->EndFile;
+ dev->block_num = dev->EndBlock = (uint32_t)addr;
+ dev->file = dev->EndFile = (uint32_t)(addr >> 32);
}
+ dcr->VolMediaId = dev->VolCatInfo.VolMediaId;
dev->file_addr += block->read_len;
dev->file_size += block->read_len;
* 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");
+ Dmsg0(250, "At end of read block\n");
if (block->read_len > block->block_len && !dev->is_tape()) {
char ed1[50];
- off_t pos = dev->lseek(dcr, (off_t)0, SEEK_CUR); /* get curr pos */
- Dmsg1(200, "Current lseek pos=%s\n", edit_int64(pos, ed1));
+ boffset_t pos = dev->lseek(dcr, (boffset_t)0, SEEK_CUR); /* get curr pos */
+ Dmsg1(250, "Current lseek pos=%s\n", edit_int64(pos, ed1));
pos -= (block->read_len - block->block_len);
dev->lseek(dcr, pos, SEEK_SET);
- Dmsg3(200, "Did lseek pos=%s blk_size=%d rdlen=%d\n",
+ Dmsg3(250, "Did lseek pos=%s blk_size=%d rdlen=%d\n",
edit_int64(pos, ed1), block->block_len,
block->read_len);
dev->file_addr = pos;
dev->file_size = pos;
}
- Dmsg2(200, "Exit read_block read_len=%d block_len=%d\n",
- block->read_len, block->block_len);
+ Dmsg3(150, "Exit read_block read_len=%d block_len=%d binbuf=%d\n",
+ block->read_len, block->block_len, block->binbuf);
block->block_read = true;
return true;
}
projects / bacula / bacula / blobdiff