*
*/
/*
- Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker
+ Copyright (C) 2000-2003 Kern Sibbald and John Walker
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
char Id[BLKHDR_ID_LENGTH+1];
uint32_t CheckSum, BlockCheckSum;
uint32_t block_len;
- uint32_t EndBlock;
+ uint32_t block_end;
uint32_t BlockNumber;
int bhl;
Dmsg1(190, "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) {
- EndBlock = block->read_len;
+ block_end = block->read_len;
} else {
- EndBlock = block_len;
+ block_end = block_len;
}
- block->binbuf = EndBlock - bhl;
+ block->binbuf = block_end - bhl;
block->block_len = block_len;
block->BlockNumber = BlockNumber;
Dmsg3(190, "Read binbuf = %d %d block_len=%d\n", block->binbuf,
{
int stat = 1;
lock_device(dev);
- if (!write_block_to_dev(dev, block)) {
+ if (!write_block_to_dev(jcr, dev, block)) {
stat = fixup_device_block_write_error(jcr, dev, block);
}
unlock_device(dev);
* Returns: 1 on success or EOT
* 0 on hard error
*/
-int write_block_to_dev(DEVICE *dev, DEV_BLOCK *block)
+int write_block_to_dev(JCR *jcr, DEVICE *dev, DEV_BLOCK *block)
{
- size_t stat = 0;
+ ssize_t stat = 0;
uint32_t wlen; /* length to write */
int hit_max1, hit_max2;
+ int ok;
#ifdef NO_TAPE_WRITE_TEST
empty_block(block);
edit_uint64(dev->VolCatInfo.VolCatMaxBytes, ed1), dev->dev_name);
}
block->failed_write = TRUE;
-/* ****FIXME**** write EOD record here */
+ dev->EndBlock = dev->block_num;
+ dev->EndFile = dev->file;
weof_dev(dev, 1); /* end the tape */
weof_dev(dev, 1); /* write second eof */
return 0;
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) {
+ if ((uint32_t)(stat=write(dev->fd, block->buf, (size_t)wlen)) != 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
* conditions. In any case, we probably want to
* simulate an End of Medium.
*/
-/***FIXME**** if we wrote a partial record, back up over it */
dev->state |= ST_EOF | ST_EOT | ST_WEOT;
clrerror_dev(dev, -1);
Mmsg4(&dev->errmsg, _("Write error on device %s. Write of %u bytes got %d. ERR=%s.\n"),
dev->dev_name, wlen, stat, strerror(dev->dev_errno));
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 */
+
+ 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,
+ * 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));
+ }
+ /* 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) {
+ DEV_BLOCK *lblock = new_block(dev);
+ /* Note, this can destroy dev->errmsg */
+ if (!read_block_from_dev(dev, lblock)) {
+ 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);
+ }
+ }
+#endif
return 0;
}
dev->VolCatInfo.VolCatBytes += block->binbuf;
dev->VolCatInfo.VolCatBlocks++;
dev->file_addr += wlen;
+ dev->EndBlock = dev->block_num;
+ dev->EndFile = dev->file;
/* Limit maximum File size on volume to user specified value */
if (dev->state & ST_TAPE) {
*/
int read_block_from_dev(DEVICE *dev, DEV_BLOCK *block)
{
- size_t stat;
+ ssize_t stat;
int looping;
looping = 0;
Mmsg1(&dev->errmsg, _("Read zero bytes on device %s.\n"), dev->dev_name);
if (dev->state & ST_EOF) { /* EOF alread read? */
dev->state |= ST_EOT; /* yes, 2 EOFs => EOT */
+ block->read_len = 0;
return 0;
}
dev->file++; /* increment file */
dev->state |= ST_EOF; /* set EOF read */
+ block->read_len = 0;
return 0; /* return eof */
}
/* Continue here for successful read */
}
if (!unser_block_header(dev, block)) {
+ block->read_len = 0;
return 0;
}
Dmsg1(000, "%s", dev->errmsg);
/* Attempt to reposition to re-read the block */
if (dev->state & ST_TAPE) {
- Dmsg0(000, "Backspace record for reread.\n");
+ Dmsg0(100, "Backspace record for reread.\n");
if (bsf_dev(dev, 1) != 0) {
Emsg0(M_ERROR, 0, dev->errmsg);
+ block->read_len = 0;
return 0;
}
} else {
- Dmsg0(000, "Seek to beginning of block for reread.\n");
+ Dmsg0(100, "Seek to beginning of block for reread.\n");
off_t pos = lseek(dev->fd, (off_t)0, SEEK_CUR); /* get curr pos */
pos -= block->read_len;
lseek(dev->fd, pos, SEEK_SET);