*
*/
/*
- Copyright (C) 2000-2003 Kern Sibbald and John Walker
+ Copyright (C) 2000-2004 Kern Sibbald and John Walker
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
* Dump the block header, then walk through
* the block printing out the record headers.
*/
-void dump_block(DEV_BLOCK *b, char *msg)
+void dump_block(DEV_BLOCK *b, const char *msg)
{
ser_declare;
char *p;
block->dev = dev;
block->block_len = block->buf_len; /* default block size */
block->buf = get_memory(block->buf_len);
- if (block->buf == NULL) {
- Mmsg0(&dev->errmsg, _("Unable to malloc block buffer.\n"));
- Emsg0(M_FATAL, 0, dev->errmsg);
- return NULL;
- }
empty_block(block);
block->BlockVer = BLOCK_VER; /* default write version */
Dmsg1(90, "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
*/
block->binbuf = WRITE_BLKHDR_LENGTH;
block->bufp = block->buf + block->binbuf;
block->read_len = 0;
- block->failed_write = FALSE;
+ block->write_failed = false;
+ block->block_read = false;
+ block->FirstIndex = block->LastIndex = 0;
}
/*
* in the buffer should have already been reserved by
* init_block.
*/
-static void ser_block_header(DEV_BLOCK *block)
+void ser_block_header(DEV_BLOCK *block)
{
ser_declare;
uint32_t CheckSum = 0;
}
/*
- * Unserialized the block header for reading block.
+ * Unserialize the block header for reading block.
* This includes setting all the buffer pointers correctly.
*
* Returns: 0 on failure (not a block)
* 1 on success
*/
-static int unser_block_header(DEVICE *dev, DEV_BLOCK *block)
+static int unser_block_header(JCR *jcr, DEVICE *dev, DEV_BLOCK *block)
{
ser_declare;
char Id[BLKHDR_ID_LENGTH+1];
block->BlockVer = 1;
block->bufp = block->buf + bhl;
if (strncmp(Id, BLKHDR1_ID, BLKHDR_ID_LENGTH) != 0) {
- Mmsg2(&dev->errmsg, _("Buffer ID error. Wanted: %s, got %s. Buffer discarded.\n"),
+ dev->dev_errno = EIO;
+ Mmsg2(&dev->errmsg, _("Volume data error! Wanted ID: %s, got %s. Buffer discarded.\n"),
BLKHDR1_ID, Id);
- Emsg0(M_ERROR, 0, dev->errmsg);
- return 0;
+ if (block->read_errors == 0 || verbose >= 2) {
+ Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg);
+ }
+ block->read_errors++;
+ if (!forge_on) {
+ return 0;
+ }
}
} else if (Id[3] == '2') {
unser_uint32(block->VolSessionId);
block->BlockVer = 2;
block->bufp = block->buf + bhl;
if (strncmp(Id, BLKHDR2_ID, BLKHDR_ID_LENGTH) != 0) {
- Mmsg2(&dev->errmsg, _("Buffer ID error. Wanted: %s, got %s. Buffer discarded.\n"),
+ dev->dev_errno = EIO;
+ Mmsg2(&dev->errmsg, _("Volume data error! Wanted ID: %s, got %s. Buffer discarded.\n"),
BLKHDR2_ID, Id);
- Emsg0(M_ERROR, 0, dev->errmsg);
- return 0;
+ if (block->read_errors == 0 || verbose >= 2) {
+ Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg);
+ }
+ block->read_errors++;
+ if (!forge_on) {
+ return 0;
+ }
}
} else {
- Mmsg1(&dev->errmsg, _("Expected block-id BB01 or BB02, got %s. Buffer discarded.\n"), Id);
- Emsg0(M_ERROR, 0, dev->errmsg);
- return 0;
+ dev->dev_errno = EIO;
+ Mmsg1(&dev->errmsg, _("Volume data error! Wanted block-id BB02, got %s. Buffer discarded.\n"), Id);
+ if (block->read_errors == 0 || verbose >= 2) {
+ Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg);
+ }
+ block->read_errors++;
+ if (!forge_on) {
+ return 0;
+ }
+ unser_uint32(block->VolSessionId);
+ unser_uint32(block->VolSessionTime);
+ bhl = BLKHDR2_LENGTH;
+ block->BlockVer = 2;
+ block->bufp = block->buf + bhl;
}
/* Sanity check */
if (block_len > MAX_BLOCK_LENGTH) {
- Mmsg1(&dev->errmsg, _("Block length %u is insane (too large), probably due to a bad archive.\n"),
+ dev->dev_errno = EIO;
+ Mmsg1(&dev->errmsg, _("Volume data error! Block length %u is insane (too large), probably due to a bad archive.\n"),
block_len);
- Emsg0(M_ERROR, 0, dev->errmsg);
- return 0;
+ if (block->read_errors == 0 || verbose >= 2) {
+ Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg);
+ }
+ block->read_errors++;
+ if (!forge_on) {
+ return 0;
+ }
}
Dmsg1(190, "unser_block_header block_len=%d\n", block_len);
BlockCheckSum = bcrc32((uint8_t *)block->buf+BLKHDR_CS_LENGTH,
block_len-BLKHDR_CS_LENGTH);
if (BlockCheckSum != CheckSum) {
- Dmsg2(00, "Block checksum mismatch: calc=%x blk=%x\n", BlockCheckSum,
- CheckSum);
- Mmsg3(&dev->errmsg, _("Block checksum mismatch in block %u: calc=%x blk=%x\n"),
+ dev->dev_errno = EIO;
+ Mmsg3(&dev->errmsg, _("Volume data error! Block checksum mismatch in block %u: calc=%x blk=%x\n"),
(unsigned)BlockNumber, BlockCheckSum, CheckSum);
- return 0;
+ if (block->read_errors == 0 || verbose >= 2) {
+ Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg);
+ }
+ block->read_errors++;
+ if (!forge_on) {
+ return 0;
+ }
}
}
return 1;
* : 0 on failure
*
*/
-int write_block_to_device(JCR *jcr, DEVICE *dev, DEV_BLOCK *block)
+int write_block_to_device(DCR *dcr, DEV_BLOCK *block)
{
int stat = 1;
- lock_device(dev);
- if (!write_block_to_dev(jcr, dev, block)) {
+ DEVICE *dev = dcr->dev;
+ JCR *jcr = dcr->jcr;
+
+
+ if (dcr->spooling) {
+ stat = write_block_to_spool_file(dcr, block);
+ return stat;
+ }
+
+ if (!dcr->dev_locked) {
+ lock_device(dev);
+ }
+
+ /*
+ * 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) {
+ /* Create a jobmedia record for this job */
+ if (!dir_create_jobmedia_record(jcr)) {
+ dev->dev_errno = EIO;
+ Jmsg(jcr, M_ERROR, 0, _("Could not create JobMedia record for Volume=\"%s\" Job=%s\n"),
+ jcr->VolCatInfo.VolCatName, jcr->Job);
+ set_new_volume_parameters(jcr, dev);
+ stat = 0;
+ goto bail_out;
+ }
+ if (dcr->NewVol) {
+ /* Note, setting a new volume also handles any pending new file */
+ set_new_volume_parameters(jcr, dev);
+ dcr->NewFile = false; /* this handled for new file too */
+ } else {
+ set_new_file_parameters(jcr, dev);
+ }
+ }
+
+ if (!write_block_to_dev(dcr, block)) {
stat = fixup_device_block_write_error(jcr, dev, block);
}
- unlock_device(dev);
+
+bail_out:
+ if (!dcr->dev_locked) {
+ unlock_device(dev);
+ }
return stat;
}
* Returns: 1 on success or EOT
* 0 on hard error
*/
-int write_block_to_dev(JCR *jcr, DEVICE *dev, DEV_BLOCK *block)
+int write_block_to_dev(DCR *dcr, DEV_BLOCK *block)
{
ssize_t stat = 0;
uint32_t wlen; /* length to write */
int hit_max1, hit_max2;
- int ok;
+ bool ok;
+ DEVICE *dev = dcr->dev;
+ JCR *jcr = dcr->jcr;
#ifdef NO_TAPE_WRITE_TEST
empty_block(block);
/* dump_block(block, "before write"); */
if (dev->state & ST_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 0;
}
/* Adjust write size to min/max for tapes only */
if (dev->state & ST_TAPE) {
- if (wlen < dev->min_block_size) {
- wlen = ((dev->min_block_size + TAPE_BSIZE - 1) / TAPE_BSIZE) * TAPE_BSIZE;
- }
/* 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) {
max_cap = dev->VolCatInfo.VolCatMaxBytes;
}
Jmsg(jcr, M_INFO, 0, _("User defined maximum volume capacity %s exceeded on device %s.\n"),
- edit_uint64(max_cap, ed1), dev->dev_name);
- block->failed_write = TRUE;
- dev->EndBlock = dev->block_num;
- dev->EndFile = dev->file;
- weof_dev(dev, 1); /* end the tape */
- weof_dev(dev, 1); /* write second eof */
+ edit_uint64_with_commas(max_cap, ed1), dev->dev_name);
+ block->write_failed = true;
+ if (weof_dev(dev, 1) != 0) { /* end tape */
+ Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg);
+ dev->VolCatInfo.VolCatErrors++;
+ }
+ /* Don't do update after second EOF or file count will be wrong */
+ Dmsg0(100, "dir_update_volume_info\n");
+ dev->VolCatInfo.VolCatFiles = dev->file;
+ dir_update_volume_info(jcr, dev, 0);
+ if (dev_cap(dev, CAP_TWOEOF) && weof_dev(dev, 1) != 0) { /* write eof */
+ Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg);
+ dev->VolCatInfo.VolCatErrors++;
+ }
dev->state |= (ST_EOF | ST_EOT | ST_WEOT);
- return 0;
+ dev->dev_errno = ENOSPC;
+ return 0;
}
/* Limit maximum File size on volume to user specified value */
- if (dev->state & ST_TAPE) {
- if ((dev->max_file_size > 0) &&
- (dev->file_addr+block->binbuf) >= dev->max_file_size) {
- if (weof_dev(dev, 1) != 0) { /* write eof */
- Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg);
- /* Plunge on anyway -- if tape is bad we will die on write */
+ if ((dev->max_file_size > 0) &&
+ (dev->file_size+block->binbuf) >= dev->max_file_size) {
+
+ if (dev_state(dev, ST_TAPE) && weof_dev(dev, 1) != 0) { /* write eof */
+ /* Write EOF */
+ Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg);
+ block->write_failed = true;
+ dev->VolCatInfo.VolCatErrors++;
+ dev->state |= (ST_EOF | ST_EOT | ST_WEOT);
+ Dmsg0(100, "dir_update_volume_info\n");
+ dev->VolCatInfo.VolCatFiles = dev->file;
+ dir_update_volume_info(jcr, dev, 0);
+ dev->dev_errno = ENOSPC;
+ return 0;
+ }
+
+ /* Create a JobMedia record so restore can seek */
+ Dmsg0(100, "dir_update_volume_info\n");
+ dev->VolCatInfo.VolCatFiles = dev->file;
+ dir_update_volume_info(jcr, dev, 0);
+ if (!dir_create_jobmedia_record(jcr)) {
+ dev->dev_errno = EIO;
+ Jmsg(jcr, M_ERROR, 0, _("Could not create JobMedia record for Volume=\"%s\" Job=%s\n"),
+ dcr->VolCatInfo.VolCatName, jcr->Job);
+ if (!forge_on) {
+ return 0;
+ }
+ }
+ dev->file_size = 0; /* reset file size */
+ /*
+ * Walk through all attached jcrs indicating the file has changed
+ */
+ Dmsg1(100, "Walk attached jcrs. Volume=%s\n", dev->VolCatInfo.VolCatName);
+ for (JCR *mjcr=NULL; (mjcr=next_attached_jcr(dev, mjcr)); ) {
+ if (mjcr->JobId == 0) {
+ continue; /* ignore console */
}
+ mjcr->dcr->NewFile = true; /* set reminder to do set_new_file_params */
}
+ set_new_file_parameters(jcr, dev);
}
dev->VolCatInfo.VolCatWrites++;
- Dmsg1(500, "Write block of %u bytes\n", wlen);
- if ((uint32_t)(stat=write(dev->fd, block->buf, (size_t)wlen)) != wlen) {
+ Dmsg1(200, "Write block of %u bytes\n", wlen);
+ stat = write(dev->fd, block->buf, (size_t)wlen);
+ if (stat != (ssize_t)wlen) {
/* We should check for errno == ENOSPC, BUT many
- * devices simply report EIO when it is full.
- * with a little more thought we may be able to check
+ * devices simply report EIO when the volume is full.
+ * With a little more thought we may be able to check
* capacity and distinguish real errors and EOT
* conditions. In any case, we probably want to
* simulate an End of Medium.
*/
- clrerror_dev(dev, -1);
-
- if (dev->dev_errno == 0) {
- dev->dev_errno = ENOSPC; /* out of space */
- }
-
- Dmsg4(10, "=== Write error. size=%u rtn=%d errno=%d: ERR=%s\n",
- wlen, stat, dev->dev_errno, strerror(dev->dev_errno));
-
if (stat == -1) {
- Jmsg(jcr, M_ERROR, 0, _("Write error on device %s. ERR=%s.\n"),
- dev->dev_name, strerror(dev->dev_errno));
+ /* I have added the ifdefing here because it appears on
+ * FreeBSD where MTIOCERRSTAT is defined, this not only
+ * clears the error but clears the residual unwritten
+ * buffers -> data loss. As a consequence, on those
+ * systems (FreeBSD like), do the clrerror() only after
+ * the weof_dev() call.
+ */
+ clrerror_dev(dev, -1);
+ if (dev->dev_errno == 0) {
+ dev->dev_errno = ENOSPC; /* out of space */
+ }
+ Jmsg4(jcr, M_ERROR, 0, _("Write error at %u:%u on device %s. ERR=%s.\n"),
+ dev->file, dev->block_num, dev->dev_name, strerror(dev->dev_errno));
} else {
- Jmsg3(jcr, M_INFO, 0, _("End of medium on device %s. Write of %u bytes got %d.\n"),
- dev->dev_name, wlen, stat);
+ dev->dev_errno = ENOSPC; /* out of space */
+ Jmsg(jcr, M_INFO, 0, _("End of medium at %u:%u on device %s. Write of %u bytes got %d.\n"),
+ dev->file, dev->block_num, dev->dev_name, wlen, stat);
}
- block->failed_write = TRUE;
- dev->EndBlock = dev->block_num;
- dev->EndFile = dev->file;
- weof_dev(dev, 1); /* end the tape */
- weof_dev(dev, 1); /* write second eof */
+
+ 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));
+
+ block->write_failed = true;
+ if (weof_dev(dev, 1) != 0) { /* end the tape */
+ dev->VolCatInfo.VolCatErrors++;
+ Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg);
+ }
+ Dmsg0(100, "dir_update_volume_info\n");
+ dev->VolCatInfo.VolCatFiles = dev->file;
+ dir_update_volume_info(jcr, dev, 0);
+ if (dev_cap(dev, CAP_TWOEOF) && weof_dev(dev, 1) != 0) { /* end the tape */
+ dev->VolCatInfo.VolCatErrors++;
+ Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg);
+ }
dev->state |= (ST_EOF | ST_EOT | ST_WEOT);
- ok = TRUE;
+ ok = true;
#define CHECK_LAST_BLOCK
#ifdef CHECK_LAST_BLOCK
/*
* If the device is a tape and it supports backspace record,
- * we backspace over two eof marks and over the last 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->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) != 0 || bsf_dev(dev, 1) != 0) {
- ok = FALSE;
- Jmsg(jcr, M_ERROR, 0, _("Back space file at EOT failed. ERR=%s\n"), strerror(dev->dev_errno));
+ 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) != 0) {
- ok = FALSE;
- Jmsg(jcr, M_ERROR, 0, _("Back space record at EOT failed. ERR=%s\n"), strerror(dev->dev_errno));
+ 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
#endif
return 0;
}
+
+ /* We successfully wrote the block, now do housekeeping */
+
dev->VolCatInfo.VolCatBytes += block->binbuf;
dev->VolCatInfo.VolCatBlocks++;
- dev->file_addr += wlen;
dev->EndBlock = dev->block_num;
dev->EndFile = dev->file;
dev->block_num++;
block->BlockNumber++;
+ /* Update jcr values */
+ if (dev_state(dev, ST_TAPE)) {
+ dcr->EndBlock = dev->EndBlock;
+ dcr->EndFile = dev->EndFile;
+ } else {
+ /* Save address of start of block just written */
+ dcr->EndBlock = (uint32_t)dev->file_addr;
+ dcr->EndFile = (uint32_t)(dev->file_addr >> 32);
+ }
+ if (dcr->VolFirstIndex == 0 && block->FirstIndex > 0) {
+ dcr->VolFirstIndex = block->FirstIndex;
+ }
+ if (block->LastIndex > 0) {
+ dcr->VolLastIndex = block->LastIndex;
+ }
+ dcr->WroteVol = true;
+ dev->file_addr += wlen; /* update file address */
+ dev->file_size += wlen;
Dmsg2(190, "write_block: wrote block %d bytes=%d\n", dev->block_num,
wlen);
ssize_t stat;
int looping;
uint32_t BlockNumber;
+ int retry;
+ DCR *dcr = jcr->dcr;
+ if (!dcr) {
+ Jmsg0(jcr, M_ABORT, 0, _("DCR is NULL!\n"));
+ }
+ if (dev_state(dev, ST_EOT)) {
+ return 0;
+ }
looping = 0;
Dmsg1(100, "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);
Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg);
block->read_len = 0;
return 0;
}
- if ((stat=read(dev->fd, block->buf, (size_t)block->buf_len)) < 0) {
+ retry = 0;
+ do {
+ stat = read(dev->fd, block->buf, (size_t)block->buf_len);
+ if (retry == 1) {
+ dev->VolCatInfo.VolCatErrors++;
+ }
+ } while (stat == -1 && (errno == EINTR || errno == EIO) && retry++ < 11);
+// Dmsg1(100, "read stat = %d\n", stat);
+ if (stat < 0) {
Dmsg1(90, "Read device got: ERR=%s\n", strerror(errno));
clrerror_dev(dev, -1);
block->read_len = 0;
- Mmsg2(&dev->errmsg, _("Read error on device %s. ERR=%s.\n"),
- dev->dev_name, strerror(dev->dev_errno));
+ Mmsg4(&dev->errmsg, _("Read error at file:block %d:%d on device %s. ERR=%s.\n"),
+ dev->file, dev->block_num, dev->dev_name, strerror(dev->dev_errno));
Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg);
+ if (dev->state & ST_EOF) { /* EOF just seen? */
+ dev->state |= ST_EOT; /* yes, error => EOT */
+ }
return 0;
}
Dmsg1(90, "Read device got %d bytes\n", stat);
if (stat == 0) { /* Got EOF ! */
dev->block_num = block->read_len = 0;
Mmsg1(&dev->errmsg, _("Read zero bytes on device %s.\n"), dev->dev_name);
- if (dev->state & ST_EOF) { /* EOF alread read? */
+ if (dev->state & ST_EOF) { /* EOF already read? */
dev->state |= ST_EOT; /* yes, 2 EOFs => EOT */
block->read_len = 0;
return 0;
/* Continue here for successful read */
block->read_len = stat; /* save length read */
if (block->read_len < BLKHDR2_LENGTH) {
- Mmsg2(&dev->errmsg, _("Very short block of %d bytes on device %s discarded.\n"),
+ dev->dev_errno = EIO;
+ Mmsg2(&dev->errmsg, _("Volume data error! Very short block of %d bytes on device %s discarded.\n"),
block->read_len, dev->dev_name);
Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg);
dev->state |= ST_SHORT; /* set short block */
}
BlockNumber = block->BlockNumber + 1;
- if (!unser_block_header(dev, block)) {
+ if (!unser_block_header(jcr, dev, block)) {
block->read_len = 0;
return 0;
}
-#ifdef somehow_working
- if (check_block_numbers) {
- if (BlockNumber != block->BlockNumber) {
- Jmsg(jcr, M_ERROR, 0, _("Incorrect block sequence number. Expected %u, got %u\n"),
- BlockNumber, block->BlockNumber);
- }
- }
-#endif
-
/*
* If the block is bigger than the buffer, we reposition for
* re-reading the block, allocate a buffer of the correct size,
* and go re-read.
*/
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);
Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg);
/* Attempt to reposition to re-read the block */
if (dev->state & ST_TAPE) {
Dmsg0(100, "Backspace record for reread.\n");
- if (bsr_dev(dev, 1) != 0) {
- Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg);
+ if (!bsr_dev(dev, 1)) {
+ Jmsg(jcr, M_ERROR, 0, "%s", strerror_dev(dev));
block->read_len = 0;
return 0;
}
off_t pos = lseek(dev->fd, (off_t)0, SEEK_CUR); /* get curr pos */
pos -= block->read_len;
lseek(dev->fd, 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);
}
if (block->block_len > block->read_len) {
- Mmsg2(&dev->errmsg, _("Short block of %d bytes on device %s discarded.\n"),
- block->read_len, dev->dev_name);
+ dev->dev_errno = EIO;
+ Mmsg3(&dev->errmsg, _("Volume data error! Short block at %u of %d bytes on device %s discarded.\n"),
+ dev->block_num, block->read_len, dev->dev_name);
Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg);
dev->state |= ST_SHORT; /* set short block */
block->read_len = block->binbuf = 0;
}
dev->state &= ~(ST_EOF|ST_SHORT); /* clear EOF and short block */
- dev->block_num++;
dev->VolCatInfo.VolCatReads++;
dev->VolCatInfo.VolCatRBytes += block->read_len;
+ dev->VolCatInfo.VolCatBytes += block->block_len;
+ dev->VolCatInfo.VolCatBlocks++;
+ dev->EndBlock = dev->block_num;
+ dev->EndFile = dev->file;
+ dev->block_num++;
+
+ /* Update jcr values */
+ if (dev->state & ST_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);
+ dev->block_num = dcr->EndBlock;
+ dev->file = dcr->EndFile;
+ }
+ dev->file_addr += block->block_len;
+ dev->file_size += block->block_len;
+
/*
* If we read a short block on disk,
* seek to beginning of next block. This saves us
lseek(dev->fd, pos, SEEK_SET);
Dmsg2(100, "Did lseek blk_size=%d rdlen=%d\n", block->block_len,
block->read_len);
+ dev->file_addr = pos;
}
Dmsg2(200, "Exit read_block read_len=%d block_len=%d\n",
block->read_len, block->block_len);
+ block->block_read = true;
return 1;
}
projects / bacula / bacula / blobdiff