} 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);
if (block->buf == NULL) {
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;
uint32_t wlen; /* length to write */
+ int hit_max1, hit_max2;
+ int ok;
#ifdef NO_TAPE_WRITE_TEST
empty_block(block);
ser_block_header(block);
/* Limit maximum Volume size to value specified by user */
- if ((dev->max_volume_size > 0) &&
- ((dev->VolCatInfo.VolCatBytes + block->binbuf)) >= dev->max_volume_size) {
+ 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];
dev->state |= ST_WEOT;
Dmsg0(10, "==== Output bytes Triggered medium max capacity.\n");
- Mmsg2(&dev->errmsg, _("Max. Volume capacity %" lld " exceeded on device %s.\n"),
- dev->max_volume_size, dev->dev_name);
+ if (hit_max1) {
+ Mmsg2(&dev->errmsg, _("Max. Volume capacity %s exceeded on device %s.\n"),
+ edit_uint64(dev->max_volume_size, ed1), dev->dev_name);
+ } else {
+ Mmsg2(&dev->errmsg, _("Max. Volume capacity %s exceeded on device %s.\n"),
+ 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;
* 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->capabilities & 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) {