/*
Bacula® - The Network Backup Solution
- Copyright (C) 2001-2007 Free Software Foundation Europe e.V.
+ Copyright (C) 2001-2009 Free Software Foundation Europe e.V.
The main author of Bacula is Kern Sibbald, with contributions from
many others, a complete list can be found in the file AUTHORS.
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- Bacula® is a registered trademark of John Walker.
+ Bacula® is a registered trademark of Kern Sibbald.
The licensor of Bacula is the Free Software Foundation Europe
(FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
Switzerland, email:ftf@fsfeurope.org.
* in the buffer should have already been reserved by
* init_block.
*/
-void ser_block_header(DEV_BLOCK *block)
+static void ser_block_header(DEV_BLOCK *block, bool do_checksum)
{
ser_declare;
uint32_t CheckSum = 0;
}
/* Checksum whole block except for the checksum */
- CheckSum = bcrc32((uint8_t *)block->buf+BLKHDR_CS_LENGTH,
- block_len-BLKHDR_CS_LENGTH);
+ if (do_checksum) {
+ CheckSum = bcrc32((uint8_t *)block->buf+BLKHDR_CS_LENGTH,
+ block_len-BLKHDR_CS_LENGTH);
+ }
Dmsg1(1390, "ser_bloc_header: checksum=%x\n", CheckSum);
ser_begin(block->buf, BLKHDR2_LENGTH);
ser_uint32(CheckSum); /* now add checksum to block header */
block->BlockNumber = BlockNumber;
Dmsg3(390, "Read binbuf = %d %d block_len=%d\n", block->binbuf,
bhl, block_len);
- if (block_len <= block->read_len) {
+ if (block_len <= block->read_len && dev->do_checksum()) {
BlockCheckSum = bcrc32((uint8_t *)block->buf+BLKHDR_CS_LENGTH,
block_len-BLKHDR_CS_LENGTH);
if (BlockCheckSum != CheckSum) {
/* Create a jobmedia record for this job */
if (!dir_create_jobmedia_record(dcr)) {
dev->dev_errno = EIO;
- Jmsg(jcr, M_FATAL, 0, _("Could not create JobMedia record for Volume=\"%s\" Job=%s\n"),
+ Jmsg2(jcr, M_FATAL, 0, _("Could not create JobMedia record for Volume=\"%s\" Job=%s\n"),
dcr->VolCatInfo.VolCatName, jcr->Job);
set_new_volume_parameters(dcr);
stat = false;
if (dcr->NewVol) {
/* Note, setting a new volume also handles any pending new file */
set_new_volume_parameters(dcr);
- dcr->NewFile = false; /* this handled for new file too */
} else {
set_new_file_parameters(dcr);
}
}
if (!write_block_to_dev(dcr)) {
- if (job_canceled(jcr) || jcr->JobType == JT_SYSTEM) {
+ if (job_canceled(jcr) || jcr->getJobType() == JT_SYSTEM) {
stat = false;
} else {
stat = fixup_device_block_write_error(dcr);
empty_block(block);
return true;
#endif
+ if (job_canceled(jcr)) {
+ return false;
+ }
ASSERT(block->binbuf == ((uint32_t) (block->bufp - block->buf)));
ASSERT(dev->is_open());
if (dev->at_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"));
+ Jmsg0(jcr, M_FATAL, 0, _("Cannot write block. Device at EOM.\n"));
return false;
}
if (!dev->can_append()) {
}
}
- ser_block_header(block);
+ ser_block_header(block, dev->do_checksum());
/* Limit maximum Volume size to value specified by user */
hit_max1 = (dev->max_volume_size > 0) &&
dev->VolCatInfo.VolCatName,
dev->file, dev->block_num, dev->print_name(), wlen, stat);
}
- Dmsg7(100, "=== Write error. fd=%d size=%u rtn=%d dev_blk=%d blk_blk=%d errno=%d: ERR=%s\n",
- dev->fd(), wlen, stat, dev->block_num, block->BlockNumber,
- dev->dev_errno, strerror(dev->dev_errno));
+ if (debug_level >= 100) {
+ berrno be;
+ Dmsg7(100, "=== Write error. fd=%d size=%u rtn=%d dev_blk=%d blk_blk=%d errno=%d: ERR=%s\n",
+ dev->fd(), wlen, stat, dev->block_num, block->BlockNumber,
+ dev->dev_errno, be.bstrerror(dev->dev_errno));
+ }
ok = terminate_writing_volume(dcr);
if (!ok && !forge_on) {
dev->VolCatInfo.VolCatBlocks++;
dev->EndBlock = dev->block_num;
dev->EndFile = dev->file;
+ dev->LastBlock = block->BlockNumber;
block->BlockNumber++;
/* Update dcr values */
* If we wrote block and the block numbers don't agree
* we have a possible problem.
*/
- if (lblock->VolSessionId == block->VolSessionId &&
- lblock->BlockNumber+1 != block->BlockNumber) {
- Jmsg(jcr, M_ERROR, 0, _(
-"Re-read of last block OK, but block numbers differ. Last block=%u Current block=%u.\n"),
- lblock->BlockNumber, block->BlockNumber);
+ if (lblock->BlockNumber != dev->LastBlock) {
+ if (dev->LastBlock > (lblock->BlockNumber + 1)) {
+ Jmsg(jcr, M_FATAL, 0, _(
+"Re-read of last block: block numbers differ by more than one.\n"
+"Probable tape misconfiguration and data loss. Read block=%u Want block=%u.\n"),
+ lblock->BlockNumber, dev->LastBlock);
+ } else {
+ Jmsg(jcr, M_ERROR, 0, _(
+"Re-read of last block OK, but block numbers differ. Read block=%u Want block=%u.\n"),
+ lblock->BlockNumber, dev->LastBlock);
+ }
} else {
Jmsg(jcr, M_INFO, 0, _("Re-read of last block succeeded.\n"));
}
#endif
}
+/*
+ * If this routine is called, we do our bookkeeping and
+ * then assure that the volume will not be written any
+ * more.
+ */
static bool terminate_writing_volume(DCR *dcr)
{
DEVICE *dev = dcr->dev;
if (!dir_create_jobmedia_record(dcr)) {
Dmsg0(190, "Error from create JobMedia\n");
dev->dev_errno = EIO;
- Jmsg(dcr->jcr, M_FATAL, 0, _("Could not create JobMedia record for Volume=\"%s\" Job=%s\n"),
+ Jmsg2(dcr->jcr, M_FATAL, 0, _("Could not create JobMedia record for Volume=\"%s\" Job=%s\n"),
dcr->VolCatInfo.VolCatName, dcr->jcr->Job);
ok = false;
- goto bail_out;
}
dcr->block->write_failed = true;
if (!dev->weof(1)) { /* end the tape */
dev->VolCatInfo.VolCatParts = dev->num_dvd_parts;
}
- if (!dir_update_volume_info(dcr, false)) {
+ if (!dir_update_volume_info(dcr, false, true)) {
ok = false;
}
Dmsg1(100, "dir_update_volume_info terminate writing -- %s\n", ok?"OK":"ERROR");
/* This may not be fatal since we already wrote an EOF */
Jmsg(dcr->jcr, M_ERROR, 0, "%s", dev->errmsg);
}
-bail_out:
+
dev->set_ateot(); /* no more writing this tape */
- Dmsg1(100, "Leave terminate_writing_volume -- %s\n", ok?"OK":"ERROR");
+ Dmsg1(50, "*** Leave terminate_writing_volume -- %s\n", ok?"OK":"ERROR");
return ok;
}
if (!dir_create_jobmedia_record(dcr)) {
Dmsg0(190, "Error from create_job_media.\n");
dev->dev_errno = EIO;
- Jmsg(jcr, M_FATAL, 0, _("Could not create JobMedia record for Volume=\"%s\" Job=%s\n"),
+ Jmsg2(jcr, M_FATAL, 0, _("Could not create JobMedia record for Volume=\"%s\" Job=%s\n"),
dcr->VolCatInfo.VolCatName, jcr->Job);
terminate_writing_volume(dcr);
dev->dev_errno = EIO;
return false;
}
dev->VolCatInfo.VolCatFiles = dev->file;
- if (!dir_update_volume_info(dcr, false)) {
+ if (!dir_update_volume_info(dcr, false, false)) {
Dmsg0(190, "Error from update_vol_info.\n");
terminate_writing_volume(dcr);
dev->dev_errno = EIO;
dev->VolCatInfo.VolCatParts = dev->num_dvd_parts;
- if (!dir_update_volume_info(dcr, false)) {
+ if (!dir_update_volume_info(dcr, false, false)) {
Dmsg0(190, "Error from update_vol_info.\n");
dev->dev_errno = EIO;
return false;
DEVICE *dev = dcr->dev;
DEV_BLOCK *block = dcr->block;
+ if (job_canceled(jcr)) {
+ return false;
+ }
ASSERT(dev->is_open());
if (dev->at_eot()) {
/* Continue here for successful read */
block->read_len = stat; /* save length read */
- if (dev->at_eof() && block->read_len == 80 &&
+ if (block->read_len == 80 &&
(dcr->VolCatInfo.LabelType != B_BACULA_LABEL ||
dcr->device->label_type != B_BACULA_LABEL)) {
/* ***FIXME*** should check label */
dcr->EndBlock = dev->EndBlock;
dcr->EndFile = dev->EndFile;
} else {
- uint64_t addr = dev->file_addr + block->read_len - 1;
+ /* We need to take care about a short block in EndBlock/File
+ * computation
+ */
+ uint32_t len = MIN(block->read_len, block->block_len);
+ uint64_t addr = dev->file_addr + len - 1;
dcr->EndBlock = (uint32_t)addr;
dcr->EndFile = (uint32_t)(addr >> 32);
- dev->block_num = dcr->EndBlock;
- dev->file = dcr->EndFile;
+ dev->block_num = dev->EndBlock = dcr->EndBlock;
+ dev->file = dev->EndFile = dcr->EndFile;
}
dcr->VolMediaId = dev->VolCatInfo.VolMediaId;
dev->file_addr += block->read_len;