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;
}
/*
int stat = 1;
lock_device(dev);
if (!write_block_to_dev(jcr, dev, block)) {
- Jmsg(jcr, M_INFO, 0, "%s", dev->errmsg);
stat = fixup_device_block_write_error(jcr, dev, block);
}
unlock_device(dev);
/* dump_block(block, "before write"); */
if (dev->state & ST_WEOT) {
Dmsg0(100, "return write_block_to_dev with ST_WEOT\n");
- Mmsg0(&dev->errmsg, _("Cannot write block. Device at EOF.\n"));
+ Jmsg(jcr, M_FATAL, 0, _("Cannot write block. Device at EOM.\n"));
return 0;
}
wlen = block->binbuf;
((dev->VolCatInfo.VolCatBytes + block->binbuf)) >= dev->VolCatInfo.VolCatMaxBytes;
if (hit_max1 || hit_max2) {
char ed1[50];
- dev->state |= ST_WEOT;
+ uint64_t max_cap;
Dmsg0(10, "==== Output bytes Triggered medium max capacity.\n");
if (hit_max1) {
- Mmsg(&dev->errmsg, _("Max. Volume capacity %s exceeded on device %s.\n"),
- edit_uint64(dev->max_volume_size, ed1), dev->dev_name);
+ max_cap = dev->max_volume_size;
} else {
- Mmsg(&dev->errmsg, _("Max. Volume capacity %s exceeded on device %s.\n"),
- edit_uint64(dev->VolCatInfo.VolCatMaxBytes, ed1), dev->dev_name);
+ max_cap = dev->VolCatInfo.VolCatMaxBytes;
}
- block->failed_write = TRUE;
+ 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->write_failed = true;
dev->EndBlock = dev->block_num;
dev->EndFile = dev->file;
weof_dev(dev, 1); /* end the tape */
weof_dev(dev, 1); /* write second eof */
+ dev->state |= (ST_EOF | ST_EOT | ST_WEOT);
return 0;
}
}
dev->VolCatInfo.VolCatWrites++;
- Dmsg1(500, "Write block of %u bytes\n", wlen);
+ Dmsg1(300, "Write block of %u bytes\n", 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
+ * 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.
*/
- dev->state |= ST_EOF | ST_EOT | ST_WEOT;
- 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) {
- Mmsg2(&dev->errmsg, _("Write error on device %s. ERR=%s.\n"),
+ clrerror_dev(dev, -1);
+ if (dev->dev_errno == 0) {
+ dev->dev_errno = ENOSPC; /* out of space */
+ }
+ Jmsg(jcr, M_ERROR, 0, _("Write error on device %s. ERR=%s.\n"),
dev->dev_name, strerror(dev->dev_errno));
} else {
- Mmsg3(&dev->errmsg, _("End of media on device %s. Write of %u bytes got %d.\n"),
+ dev->dev_errno = ENOSPC; /* out of space */
+ Jmsg3(jcr, M_INFO, 0, _("End of medium on device %s. Write of %u bytes got %d.\n"),
dev->dev_name, wlen, stat);
}
- block->failed_write = TRUE;
+
+ Dmsg4(10, "=== Write error. size=%u rtn=%d errno=%d: ERR=%s\n",
+ wlen, stat, dev->dev_errno, strerror(dev->dev_errno));
+
+ block->write_failed = true;
dev->EndBlock = dev->block_num;
dev->EndFile = dev->file;
weof_dev(dev, 1); /* end the tape */
weof_dev(dev, 1); /* write second eof */
+ dev->state |= (ST_EOF | ST_EOT | ST_WEOT);
ok = TRUE;
#define CHECK_LAST_BLOCK
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));
+ /*
+ * 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 */
- if (!read_block_from_dev(dev, lblock)) {
+ if (!read_block_from_dev(jcr, dev, lblock, 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) {
dev->block_num++;
block->BlockNumber++;
-
Dmsg2(190, "write_block: wrote block %d bytes=%d\n", dev->block_num,
wlen);
empty_block(block);
* Read block with locking
*
*/
-int read_block_from_device(DEVICE *dev, DEV_BLOCK *block)
+int read_block_from_device(JCR *jcr, DEVICE *dev, DEV_BLOCK *block, bool check_block_numbers)
{
int stat;
Dmsg0(90, "Enter read_block_from_device\n");
lock_device(dev);
- stat = read_block_from_dev(dev, block);
+ stat = read_block_from_dev(jcr, dev, block, check_block_numbers);
unlock_device(dev);
Dmsg0(90, "Leave read_block_from_device\n");
return stat;
* the block header. For a file, the block may be partially
* or completely in the current buffer.
*/
-int read_block_from_dev(DEVICE *dev, DEV_BLOCK *block)
+int read_block_from_dev(JCR *jcr, DEVICE *dev, DEV_BLOCK *block, bool check_block_numbers)
{
ssize_t stat;
int looping;
+ uint32_t BlockNumber;
+ int retry = 0;
looping = 0;
Dmsg1(100, "Full read() in read_block_from_device() len=%d\n",
if (looping > 1) {
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) {
+ 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);
+ 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));
+ 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;
if (block->read_len < BLKHDR2_LENGTH) {
Mmsg2(&dev->errmsg, _("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 */
block->read_len = block->binbuf = 0;
return 0; /* return error */
}
+ BlockNumber = block->BlockNumber + 1;
if (!unser_block_header(dev, block)) {
block->read_len = 0;
return 0;
if (block->block_len > block->buf_len) {
Mmsg2(&dev->errmsg, _("Block length %u is greater than buffer %u. Attempting recovery.\n"),
block->block_len, block->buf_len);
- Emsg0(M_WARNING, 0, dev->errmsg);
- Dmsg1(000, "%s", dev->errmsg);
+ 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) {
Dmsg0(100, "Backspace record for reread.\n");
- if (bsf_dev(dev, 1) != 0) {
- Emsg0(M_ERROR, 0, dev->errmsg);
+ if (bsr_dev(dev, 1) != 0) {
+ Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg);
block->read_len = 0;
return 0;
}
pos -= block->read_len;
lseek(dev->fd, pos, SEEK_SET);
}
- Mmsg1(&dev->errmsg, _("Resetting buffer size to %u bytes.\n"), block->block_len);
- Emsg0(M_WARNING, 0, dev->errmsg);
- Dmsg1(000, "%s", dev->errmsg);
+ Mmsg1(&dev->errmsg, _("Setting block buffer size to %u bytes.\n"), block->block_len);
+ Jmsg(jcr, M_INFO, 0, "%s", dev->errmsg);
+ Pmsg1(000, "%s", dev->errmsg);
/* Set new block length */
dev->max_block_size = block->block_len;
block->buf_len = block->block_len;
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);
+ Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg);
dev->state |= ST_SHORT; /* set short block */
block->read_len = block->binbuf = 0;
return 0; /* return error */
dev->state &= ~(ST_EOF|ST_SHORT); /* clear EOF and short block */
dev->block_num++;
+ dev->VolCatInfo.VolCatReads++;
+ dev->VolCatInfo.VolCatRBytes += block->read_len;
/*
* If we read a short block on disk,
}
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