* 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;
* 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;
block->BlockVer = 1;
block->bufp = block->buf + bhl;
if (strncmp(Id, BLKHDR1_ID, BLKHDR_ID_LENGTH) != 0) {
+ dev->dev_errno = EIO;
Mmsg2(&dev->errmsg, _("Volume data error! Wanted ID: %s, got %s. Buffer discarded.\n"),
BLKHDR1_ID, Id);
if (block->read_errors == 0 || verbose >= 2) {
Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg);
}
block->read_errors++;
- return 0;
+ 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) {
+ dev->dev_errno = EIO;
Mmsg2(&dev->errmsg, _("Volume data error! Wanted ID: %s, got %s. Buffer discarded.\n"),
BLKHDR2_ID, Id);
if (block->read_errors == 0 || verbose >= 2) {
Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg);
}
block->read_errors++;
- return 0;
+ if (!forge_on) {
+ return 0;
+ }
}
} else {
+ 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++;
- return 0;
+ 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) {
+ 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);
if (block->read_errors == 0 || verbose >= 2) {
Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg);
}
block->read_errors++;
- return 0;
+ 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) {
+ 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);
if (block->read_errors == 0 || verbose >= 2) {
Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg);
}
block->read_errors++;
- return 0;
+ 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;
- DCR *dcr = jcr->dcr;
+ DEVICE *dev = dcr->dev;
+ JCR *jcr = dcr->jcr;
- lock_device(dev);
+
+ 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
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);
- unlock_device(dev);
- return 0;
+ stat = 0;
+ goto bail_out;
}
if (dcr->NewVol) {
/* Note, setting a new volume also handles any pending new file */
}
}
- if (!write_block_to_dev(jcr, dev, block)) {
+ 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;
bool ok;
- DCR *dcr = jcr->dcr;
+ 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) {
dev->VolCatInfo.VolCatErrors++;
}
dev->state |= (ST_EOF | ST_EOT | ST_WEOT);
+ dev->dev_errno = ENOSPC;
return 0;
}
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;
}
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);
- return 0;
+ if (!forge_on) {
+ return 0;
+ }
}
dev->file_size = 0; /* reset file size */
/*
}
dev->VolCatInfo.VolCatWrites++;
- Dmsg1(300, "Write block of %u bytes\n", 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
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"),
+ 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 {
dev->dev_errno = ENOSPC; /* out of space */
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;
}
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);
/* Continue here for successful read */
block->read_len = stat; /* save length read */
if (block->read_len < BLKHDR2_LENGTH) {
+ 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);
* 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);
}
if (block->block_len > block->read_len) {
+ 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);
projects / bacula / bacula / blobdiff