+/*
+ Bacula® - The Network Backup Solution
+
+ 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.
+ This program is Free Software; you can redistribute it and/or
+ modify it under the terms of version two of the GNU General Public
+ License as published by the Free Software Foundation and included
+ in the file LICENSE.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA.
+
+ 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.
+*/
/*
*
* block.c -- tape block handling functions
* Version $Id$
*
*/
-/*
- Copyright (C) 2001-2006 Kern Sibbald
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- version 2 as amended with additional clauses defined in the
- file LICENSE in the main source directory.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- the file LICENSE for additional details.
-
- */
#include "bacula.h"
* 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 */
dev->dev_errno = EIO;
Mmsg4(dev->errmsg, _("Volume data error at %u:%u! Wanted ID: \"%s\", got \"%s\". Buffer discarded.\n"),
dev->file, dev->block_num, BLKHDR2_ID, Id);
+ Dmsg1(50, "%s", dev->errmsg);
if (block->read_errors == 0 || verbose >= 2) {
Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg);
}
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) {
return stat;
}
- if (!dcr->dev_locked) {
- lock_device(dev);
+ if (!dcr->is_dev_locked()) { /* device already locked? */
+ /* note, do not change this to dcr->r_dlock */
+ dev->r_dlock(); /* no, lock it */
}
/*
/* 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->get_JobType() == JT_SYSTEM) {
stat = false;
} else {
stat = fixup_device_block_write_error(dcr);
}
bail_out:
- if (!dcr->dev_locked) {
- unlock_device(dev);
+ if (!dcr->is_dev_locked()) { /* did we lock dev above? */
+ /* note, do not change this to dcr->dunlock */
+ dev->dunlock(); /* unlock it now */
}
return stat;
}
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());
/* dump_block(block, "before write"); */
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()) {
if (wlen != block->buf_len) {
uint32_t blen; /* current buffer length */
- Dmsg2(200, "binbuf=%d buf_len=%d\n", block->binbuf, block->buf_len);
+ Dmsg2(250, "binbuf=%d buf_len=%d\n", block->binbuf, block->buf_len);
blen = wlen;
/* Adjust write size to min/max for tapes only */
}
}
- 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) &&
if (hit_max1 || hit_max2) {
char ed1[50];
uint64_t max_cap;
- Dmsg0(10, "==== Output bytes Triggered medium max capacity.\n");
+ Dmsg0(100, "==== Output bytes Triggered medium max capacity.\n");
if (hit_max1) {
max_cap = dev->max_volume_size;
} else {
#endif
/*
- * Do write here
+ * Do write here, make a somewhat feeble attempt to recover from
+ * I/O errors, or from the OS telling us it is busy.
*/
- stat = write(dev->fd, block->buf, (size_t)wlen);
+ int retry = 0;
+ errno = 0;
+ stat = 0;
+ do {
+ if (retry > 0 && stat == -1 && errno == EBUSY) {
+ berrno be;
+ Dmsg4(100, "===== write retry=%d stat=%d errno=%d: ERR=%s\n",
+ retry, stat, errno, be.bstrerror());
+ bmicrosleep(5, 0); /* pause a bit if busy or lots of errors */
+ dev->clrerror(-1);
+ }
+ stat = dev->write(block->buf, (size_t)wlen);
+
+ } while (stat == -1 && (errno == EBUSY || errno == EIO) && retry++ < 3);
#ifdef DEBUG_BLOCK_ZEROING
if (bp[0] == 0 && bp[1] == 0 && bp[2] == 0 && block->buf[12] == 0) {
dev->dev_errno = ENOSPC; /* out of space */
}
if (dev->dev_errno != ENOSPC) {
+ dev->VolCatInfo.VolCatErrors++;
Jmsg4(jcr, M_ERROR, 0, _("Write error at %u:%u on device %s. ERR=%s.\n"),
- dev->file, dev->block_num, dev->print_name(), be.strerror());
+ dev->file, dev->block_num, dev->print_name(), be.bstrerror());
}
} else {
dev->dev_errno = ENOSPC; /* out of space */
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) {
}
/* We successfully wrote the block, now do housekeeping */
-
- dev->VolCatInfo.VolCatBytes += block->binbuf;
+ Dmsg2(1300, "VolCatBytes=%d newVolCatBytes=%d\n", (int)dev->VolCatInfo.VolCatBytes,
+ (int)(dev->VolCatInfo.VolCatBytes+wlen));
+ dev->VolCatInfo.VolCatBytes += wlen;
dev->VolCatInfo.VolCatBlocks++;
dev->EndBlock = dev->block_num;
dev->EndFile = dev->file;
- dev->block_num++;
+ dev->LastBlock = block->BlockNumber;
block->BlockNumber++;
/* Update dcr values */
if (dev->is_tape()) {
dcr->EndBlock = dev->EndBlock;
dcr->EndFile = dev->EndFile;
+ dev->block_num++;
} else {
/* Save address of block just written */
uint64_t addr = dev->file_addr + wlen - 1;
dev->block_num = dcr->EndBlock;
dev->file = dcr->EndFile;
}
+ dcr->VolMediaId = dev->VolCatInfo.VolMediaId;
if (dcr->VolFirstIndex == 0 && block->FirstIndex > 0) {
dcr->VolFirstIndex = block->FirstIndex;
}
* then re-read it and verify that the block number is
* correct.
*/
- if (dev->is_tape() && dev_cap(dev, CAP_BSR)) {
+ if (dev->is_tape() && dev->has_cap(CAP_BSR)) {
/* Now back up over what we wrote and read the last block */
if (!dev->bsf(1)) {
berrno be;
ok = false;
Jmsg(jcr, M_ERROR, 0, _("Backspace file at EOT failed. ERR=%s\n"),
- be.strerror(dev->dev_errno));
+ be.bstrerror(dev->dev_errno));
}
if (ok && dev->has_cap(CAP_TWOEOF) && !dev->bsf(1)) {
berrno be;
ok = false;
Jmsg(jcr, M_ERROR, 0, _("Backspace file at EOT failed. ERR=%s\n"),
- be.strerror(dev->dev_errno));
+ be.bstrerror(dev->dev_errno));
}
/* Backspace over record */
if (ok && !dev->bsr(1)) {
berrno be;
ok = false;
Jmsg(jcr, M_ERROR, 0, _("Backspace record at EOT failed. ERR=%s\n"),
- be.strerror(dev->dev_errno));
+ be.bstrerror(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()
+ * tape is requested. Note, the clrerror() call in bsr()
* calls ioctl(MTCERRSTAT), which *should* fix the problem.
*/
}
* 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 */
}
bstrncpy(dev->VolCatInfo.VolCatStatus, "Full", sizeof(dev->VolCatInfo.VolCatStatus));
dev->VolCatInfo.VolCatFiles = dev->file; /* set number of files */
- dev->VolCatInfo.VolCatJobs++; /* increment number of jobs */
if (dev->is_dvd()) {
- dvd_write_part(dcr); /* write last part */
- dev->VolCatInfo.VolCatParts = dev->num_parts;
+ if (!dvd_write_part(dcr)) { /* write last part */
+ dev->VolCatInfo.VolCatErrors++;
+ Jmsg(dcr->jcr, M_FATAL, 0, _("Error writing final part to DVD. "
+ "This Volume may not be readable.\n%s"),
+ dev->errmsg);
+ ok = false;
+ Dmsg0(100, "dvd_write_part error.\n");
+ }
+ 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");
/* Set new file/block parameters for current dcr */
set_new_file_parameters(dcr);
- if (ok && dev_cap(dev, CAP_TWOEOF) && !dev->weof(1)) { /* end the tape */
+ if (ok && dev->has_cap(CAP_TWOEOF) && !dev->weof(1)) { /* end the tape */
dev->VolCatInfo.VolCatErrors++;
/* 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"),
- dcr->VolCatInfo.VolCatName, jcr->Job);
- terminate_writing_volume(dcr);
- dev->dev_errno = EIO;
- return false;
+ 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;
/* Limit maximum part size to value specified by user
*/
if (dev->max_part_size > 0 && ((dev->part_size + block->binbuf) >= dev->max_part_size)) {
- if (dev->part < dev->num_parts) {
+ if (dev->part < dev->num_dvd_parts) {
Jmsg3(dcr->jcr, M_FATAL, 0, _("Error while writing, current part number"
" is less than the total number of parts (%d/%d, device=%s)\n"),
- dev->part, dev->num_parts, dev->print_name());
+ dev->part, dev->num_dvd_parts, dev->print_name());
dev->dev_errno = EIO;
return false;
}
return false;
}
- dev->VolCatInfo.VolCatParts = dev->num_parts;
+ 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;
}
}
+
+ dev->update_freespace();
if (!dev->is_freespace_ok()) { /* Error while getting free space */
char ed1[50], ed2[50];
- Dmsg1(10, "Cannot get free space on the device ERR=%s.\n", dev->errmsg);
+ Dmsg1(100, "Cannot get free space on the device ERR=%s.\n", dev->errmsg);
Jmsg(jcr, M_FATAL, 0, _("End of Volume \"%s\" at %u:%u on device %s "
"(part_size=%s, free_space=%s, free_space_errno=%d, errmsg=%s).\n"),
dev->VolCatInfo.VolCatName,
if ((dev->is_freespace_ok() && (dev->part_size + block->binbuf) >= dev->free_space)) {
char ed1[50], ed2[50];
- Dmsg0(10, "==== Just enough free space on the device to write the current part...\n");
+ Dmsg0(100, "==== Just enough free space on the device to write the current part...\n");
Jmsg(jcr, M_INFO, 0, _("End of Volume \"%s\" at %u:%u on device %s "
"(part_size=%s, free_space=%s, free_space_errno=%d).\n"),
dev->VolCatInfo.VolCatName,
{
bool ok;
DEVICE *dev = dcr->dev;
- Dmsg0(200, "Enter read_block_from_device\n");
- lock_device(dev);
+ Dmsg0(250, "Enter read_block_from_device\n");
+ dev->r_dlock();
ok = read_block_from_dev(dcr, check_block_numbers);
- unlock_device(dev);
- Dmsg0(200, "Leave read_block_from_device\n");
+ dev->dunlock();
+ Dmsg0(250, "Leave read_block_from_device\n");
return ok;
}
JCR *jcr = dcr->jcr;
DEVICE *dev = dcr->dev;
DEV_BLOCK *block = dcr->block;
+
+ if (job_canceled(jcr)) {
+ return false;
+ }
+ ASSERT(dev->is_open());
if (dev->at_eot()) {
return false;
}
looping = 0;
- Dmsg1(200, "Full read() in read_block_from_device() len=%d\n",
+ Dmsg1(250, "Full read in read_block_from_device() len=%d\n",
block->buf_len);
reread:
if (looping > 1) {
return false;
}
- /*Dmsg1(100, "dev->file_size=%u\n",(unsigned int)dev->file_size);
- Dmsg1(100, "dev->file_addr=%u\n",(unsigned int)dev->file_addr);
- Dmsg1(100, "lseek=%u\n",(unsigned int)lseek(dev->fd, 0, SEEK_CUR));
- Dmsg1(100, "dev->part_start=%u\n",(unsigned int)dev->part_start);
- Dmsg1(100, "dev->file_addr-dev->part_start=%u\n",(unsigned int)dev->file_addr-dev->part_start);
- Dmsg1(100, "dev->file_size-dev->part_start=%u\n",(unsigned int)dev->file_size-dev->part_start);
- Dmsg1(100, "dev->part_size=%u\n", (unsigned int)dev->part_size);
- Dmsg1(100, "dev->part=%u\n", (unsigned int)dev->part);
- Dmsg1(100, "dev->num_parts=%u\n", (unsigned int)dev->num_parts);
- Dmsg1(100, "dev->VolCatInfo.VolCatParts=%u\n", (unsigned int)dev->VolCatInfo.VolCatParts);
- Dmsg3(100, "Tests : %d %d %d\n", (dev->VolCatInfo.VolCatParts > 0),
+// #define lots_of_debug
+#ifdef lots_of_debug
+ if (dev->at_eof() && dev->is_dvd()) {
+ Dmsg1(100, "file_size=%u\n",(unsigned int)dev->file_size);
+ Dmsg1(100, "file_addr=%u\n",(unsigned int)dev->file_addr);
+ Dmsg1(100, "lseek=%u\n",(unsigned int)lseek(dev->fd(), 0, SEEK_CUR));
+ Dmsg1(100, "part_start=%u\n",(unsigned int)dev->part_start);
+ Dmsg1(100, "part_size=%u\n", (unsigned int)dev->part_size);
+ Dmsg2(100, "part=%u num_dvd_parts=%u\n", dev->part, dev->num_dvd_parts);
+ Dmsg1(100, "VolCatInfo.VolCatParts=%u\n", (unsigned int)dev->VolCatInfo.VolCatParts);
+ Dmsg3(100, "Tests : %d %d %d\n", (dev->VolCatInfo.VolCatParts > 0),
((dev->file_addr-dev->part_start) == dev->part_size),
- (dev->part <= dev->VolCatInfo.VolCatParts));*/
+ (dev->part <= dev->VolCatInfo.VolCatParts));
+ }
+#endif
+
/* Check for DVD part file end */
- if (dev->at_eof() && dev->is_dvd() && dev->num_parts > 0 &&
- dev->part < dev->num_parts) {
+ if (dev->at_eof() && dev->is_dvd() && dev->num_dvd_parts > 0 &&
+ dev->part <= dev->num_dvd_parts) {
+ Dmsg0(400, "Call dvd_open_next_part\n");
if (dvd_open_next_part(dcr) < 0) {
Jmsg3(dcr->jcr, M_FATAL, 0, _("Unable to open device part=%d %s: ERR=%s\n"),
dev->part, dev->print_name(), dev->bstrerror());
}
retry = 0;
+ errno = 0;
+ stat = 0;
do {
-// uint32_t *bp = (uint32_t *)block->buf;
-// Pmsg3(000, "Read %p %u at %llu\n", block->buf, block->buf_len, lseek(dev->fd, 0, SEEK_CUR));
-
- stat = read(dev->fd, block->buf, (size_t)block->buf_len);
-
-// Pmsg8(000, "stat=%d Csum=%u blen=%u bnum=%u %c%c%c%c\n",stat, bp[0],bp[1],bp[2],
-// block->buf[12],block->buf[13],block->buf[14],block->buf[15]);
-
- if (retry == 1) {
- dev->VolCatInfo.VolCatErrors++;
+ if ((retry > 0 && stat == -1 && errno == EBUSY)) {
+ berrno be;
+ Dmsg4(100, "===== read retry=%d stat=%d errno=%d: ERR=%s\n",
+ retry, stat, errno, be.bstrerror());
+ bmicrosleep(10, 0); /* pause a bit if busy or lots of errors */
+ dev->clrerror(-1);
}
- } while (stat == -1 && (errno == EINTR || errno == EIO) && retry++ < 11);
+ stat = dev->read(block->buf, (size_t)block->buf_len);
+
+ } while (stat == -1 && (errno == EBUSY || errno == EINTR || errno == EIO) && retry++ < 3);
if (stat < 0) {
berrno be;
dev->clrerror(-1);
- Dmsg1(200, "Read device got: ERR=%s\n", be.strerror());
+ Dmsg1(250, "Read device got: ERR=%s\n", be.bstrerror());
block->read_len = 0;
- Mmsg4(dev->errmsg, _("Read error at file:blk %u:%u on device %s. ERR=%s.\n"),
- dev->file, dev->block_num, dev->print_name(), be.strerror());
+ Mmsg5(dev->errmsg, _("Read error on fd=%d at file:blk %u:%u on device %s. ERR=%s.\n"),
+ dev->fd(), dev->file, dev->block_num, dev->print_name(), be.bstrerror());
Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg);
if (dev->at_eof()) { /* EOF just seen? */
dev->set_eot(); /* yes, error => EOT */
}
return false;
}
- Dmsg3(200, "Read device got %d bytes at %u:%u\n", stat,
+ Dmsg3(250, "Read device got %d bytes at %u:%u\n", stat,
dev->file, dev->block_num);
if (stat == 0) { /* Got EOF ! */
dev->block_num = 0;
dev->set_ateof();
return false; /* return eof */
}
+
/* Continue here for successful read */
+
block->read_len = stat; /* save length read */
+ if (block->read_len == 80 &&
+ (dcr->VolCatInfo.LabelType != B_BACULA_LABEL ||
+ dcr->device->label_type != B_BACULA_LABEL)) {
+ /* ***FIXME*** should check label */
+ Dmsg2(100, "Ignore 80 byte ANSI label at %u:%u\n", dev->file, dev->block_num);
+ dev->clear_eof();
+ goto reread; /* skip ANSI/IBM label */
+ }
+
if (block->read_len < BLKHDR2_LENGTH) {
dev->dev_errno = EIO;
Mmsg4(dev->errmsg, _("Volume data error at %u:%u! Very short block of %d bytes on device %s discarded.\n"),
Pmsg1(000, "%s", dev->errmsg);
/* Attempt to reposition to re-read the block */
if (dev->is_tape()) {
- Dmsg0(200, "BSR for reread; block too big for buffer.\n");
+ Dmsg0(250, "BSR for reread; block too big for buffer.\n");
if (!dev->bsr(1)) {
Jmsg(jcr, M_ERROR, 0, "%s", dev->bstrerror());
block->read_len = 0;
return false;
}
} else {
- Dmsg0(200, "Seek to beginning of block for reread.\n");
- off_t pos = lseek_dev(dev, (off_t)0, SEEK_CUR); /* get curr pos */
+ Dmsg0(250, "Seek to beginning of block for reread.\n");
+ boffset_t pos = dev->lseek(dcr, (boffset_t)0, SEEK_CUR); /* get curr pos */
pos -= block->read_len;
- lseek_dev(dev, pos, SEEK_SET);
+ dev->lseek(dcr, pos, SEEK_SET);
dev->file_addr = pos;
}
Mmsg1(dev->errmsg, _("Setting block buffer size to %u bytes.\n"), block->block_len);
dev->VolCatInfo.VolCatReads++;
dev->VolCatInfo.VolCatRBytes += block->read_len;
- dev->VolCatInfo.VolCatBytes += block->block_len;
- dev->VolCatInfo.VolCatBlocks++;
dev->EndBlock = dev->block_num;
dev->EndFile = dev->file;
dev->block_num++;
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;
dev->file_size += block->read_len;
* lseek(). One to get the position, then the second to do an
* absolute positioning -- so much for efficiency. KES Sep 02.
*/
- Dmsg0(200, "At end of read block\n");
+ Dmsg0(250, "At end of read block\n");
if (block->read_len > block->block_len && !dev->is_tape()) {
char ed1[50];
- off_t pos = lseek_dev(dev, (off_t)0, SEEK_CUR); /* get curr pos */
+ boffset_t pos = dev->lseek(dcr, (boffset_t)0, SEEK_CUR); /* get curr pos */
+ Dmsg1(250, "Current lseek pos=%s\n", edit_int64(pos, ed1));
pos -= (block->read_len - block->block_len);
- lseek_dev(dev, pos, SEEK_SET);
- Dmsg3(200, "Did lseek pos=%s blk_size=%d rdlen=%d\n",
- edit_uint64(pos, ed1), block->block_len,
+ dev->lseek(dcr, pos, SEEK_SET);
+ Dmsg3(250, "Did lseek pos=%s blk_size=%d rdlen=%d\n",
+ edit_int64(pos, ed1), block->block_len,
block->read_len);
dev->file_addr = pos;
dev->file_size = pos;
}
- Dmsg2(200, "Exit read_block read_len=%d block_len=%d\n",
+ Dmsg2(250, "Exit read_block read_len=%d block_len=%d\n",
block->read_len, block->block_len);
block->block_read = true;
return true;
projects / bacula / bacula / blobdiff