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 ignored.\n"),
+ block->read_errors);
+ }
+}
+
/*
* Free block
*/
block->read_len = 0;
block->write_failed = false;
block->block_read = false;
+ block->FirstIndex = block->LastIndex = 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];
if (strncmp(Id, BLKHDR1_ID, BLKHDR_ID_LENGTH) != 0) {
Mmsg2(&dev->errmsg, _("Buffer ID error. Wanted: %s, got %s. Buffer discarded.\n"),
BLKHDR1_ID, Id);
- Emsg0(M_ERROR, 0, dev->errmsg);
+ if (block->read_errors == 0 || verbose >= 2) {
+ Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg);
+ }
+ block->read_errors++;
return 0;
}
} else if (Id[3] == '2') {
if (strncmp(Id, BLKHDR2_ID, BLKHDR_ID_LENGTH) != 0) {
Mmsg2(&dev->errmsg, _("Buffer ID error. Wanted: %s, got %s. Buffer discarded.\n"),
BLKHDR2_ID, Id);
- Emsg0(M_ERROR, 0, dev->errmsg);
+ if (block->read_errors == 0 || verbose >= 2) {
+ Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg);
+ }
+ block->read_errors++;
return 0;
}
} else {
Mmsg1(&dev->errmsg, _("Expected block-id BB01 or BB02, got %s. Buffer discarded.\n"), Id);
- Emsg0(M_ERROR, 0, dev->errmsg);
+ if (block->read_errors == 0 || verbose >= 2) {
+ Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg);
+ }
+ block->read_errors++;
return 0;
}
if (block_len > MAX_BLOCK_LENGTH) {
Mmsg1(&dev->errmsg, _("Block length %u is insane (too large), probably due to a bad archive.\n"),
block_len);
- Emsg0(M_ERROR, 0, dev->errmsg);
+ if (block->read_errors == 0 || verbose >= 2) {
+ Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg);
+ }
+ block->read_errors++;
return 0;
}
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"),
(unsigned)BlockNumber, BlockCheckSum, CheckSum);
+ if (block->read_errors == 0 || verbose >= 2) {
+ Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg);
+ }
+ block->read_errors++;
return 0;
}
}
{
int stat = 1;
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 saem applies for if we are in a new file.
+ */
+ if (jcr->NewVol || jcr->NewFile) {
+ /* Create a jobmedia record for this job */
+ if (!dir_create_jobmedia_record(jcr)) {
+ 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);
+ unlock_device(dev);
+ return 0;
+ }
+ if (jcr->NewVol) {
+ /* Note, setting a new volume also handles any pending new file */
+ set_new_volume_parameters(jcr, dev);
+ jcr->NewFile = false; /* this handled for new file too */
+ } else {
+ set_new_file_parameters(jcr, dev);
+ }
+ }
+
if (!write_block_to_dev(jcr, dev, block)) {
stat = fixup_device_block_write_error(jcr, dev, block);
}
+
unlock_device(dev);
return stat;
}
ssize_t stat = 0;
uint32_t wlen; /* length to write */
int hit_max1, hit_max2;
- int ok;
+ bool ok;
#ifdef NO_TAPE_WRITE_TEST
empty_block(block);
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 */
+ if (weof_dev(dev, 1) != 0) { /* end tape */
+ Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg);
+ }
+ /* 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->state |= (ST_EOF | ST_EOT | ST_WEOT);
- return 0;
+ return 0;
}
/* Limit maximum File size on volume to user specified value */
- if (dev->state & ST_TAPE) {
+ if (dev_state(dev, ST_TAPE)) {
if ((dev->max_file_size > 0) &&
(dev->file_addr+block->binbuf) >= dev->max_file_size) {
+
+ /* Write EOF */
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 */
+ block->write_failed = true;
+ 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);
+ return 0;
+ }
+
+ /* Do bookkeeping to handle EOF just written */
+ 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)) {
+ Jmsg(jcr, M_ERROR, 0, _("Could not create JobMedia record for Volume=\"%s\" Job=%s\n"),
+ jcr->VolCatInfo.VolCatName, jcr->Job);
+ return 0;
+ }
+ /*
+ * 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->NewFile = true; /* set reminder to do set_new_file_params */
}
+ set_new_file_parameters(jcr, dev);
}
}
dev->VolCatInfo.VolCatWrites++;
Dmsg1(300, "Write block of %u bytes\n", wlen);
- if ((uint32_t)(stat=write(dev->fd, block->buf, (size_t)wlen)) != 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 */
+ }
+ Jmsg(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);
}
+
+ 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;
- dev->EndBlock = dev->block_num;
- dev->EndFile = dev->file;
- weof_dev(dev, 1); /* end the tape */
- weof_dev(dev, 1); /* write second eof */
+ if (weof_dev(dev, 1) != 0) { /* end the tape */
+ 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 */
+ 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->block_num++;
block->BlockNumber++;
+ /* Update jcr values */
+ if (dev_state(dev, ST_TAPE)) {
+ jcr->EndBlock = dev->EndBlock;
+ jcr->EndFile = dev->EndFile;
+ } else {
+ jcr->EndBlock = (uint32_t)dev->file_addr;
+ jcr->EndFile = (uint32_t)(dev->file_addr >> 32);
+ }
+ if (jcr->VolFirstIndex == 0 && block->FirstIndex > 0) {
+ jcr->VolFirstIndex = block->FirstIndex;
+ }
+ if (block->LastIndex > 0) {
+ jcr->VolLastIndex = block->LastIndex;
+ }
+ jcr->WroteVol = true;
Dmsg2(190, "write_block: wrote block %d bytes=%d\n", dev->block_num,
wlen);
ssize_t stat;
int looping;
uint32_t BlockNumber;
- int retry = 0;
+ int retry;
+ 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);
block->read_len = 0;
return 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);
}
BlockNumber = block->BlockNumber + 1;
- if (!unser_block_header(dev, block)) {
+ if (!unser_block_header(jcr, dev, block)) {
block->read_len = 0;
return 0;
}
/* 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;
}
}
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);
+ Mmsg3(&dev->errmsg, _("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->file_addr += block->block_len;
+ dev->EndBlock = dev->block_num;
+ dev->EndFile = dev->file;
+ dev->block_num++;
+
+ /* Update jcr values */
+ if (dev->state & ST_TAPE) {
+ jcr->EndBlock = dev->EndBlock;
+ jcr->EndFile = dev->EndFile;
+ } else {
+ jcr->EndBlock = (uint32_t)dev->file_addr;
+ jcr->EndFile = (uint32_t)(dev->file_addr >> 32);
+ }
+
/*
* If we read a short block on disk,
* seek to beginning of next block. This saves us
projects / bacula / bacula / blobdiff