-/*
- *
- * block.c -- tape block handling functions
- *
- * Kern Sibbald, March MMI
- * added BB02 format October MMII
- *
- * Version $Id$
- *
- */
/*
Bacula® - The Network Backup Solution
- Copyright (C) 2001-2007 Free Software Foundation Europe e.V.
+ Copyright (C) 2001-2008 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 plus additions
- that are listed in the file LICENSE.
+ 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
(FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
Switzerland, email:ftf@fsfeurope.org.
*/
+/*
+ *
+ * block.c -- tape block handling functions
+ *
+ * Kern Sibbald, March MMI
+ * added BB02 format October MMII
+ *
+ * Version $Id$
+ *
+ */
#include "bacula.h"
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);
}
return stat;
}
- if (!dcr->dev_locked) { /* device already locked? */
+ if (!dcr->is_dev_locked()) { /* device already locked? */
+ /* note, do not change this to dcr->r_dlock */
dev->r_dlock(); /* no, lock it */
}
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);
}
}
bail_out:
- if (!dcr->dev_locked) { /* did we lock dev above? */
+ 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;
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 */
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 {
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->block_num = dcr->EndBlock;
dev->file = dcr->EndFile;
}
+ dcr->VolMediaId = dev->VolCatInfo.VolMediaId;
if (dcr->VolFirstIndex == 0 && block->FirstIndex > 0) {
dcr->VolFirstIndex = block->FirstIndex;
}
#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;
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;
}
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;
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");
+ Dmsg0(250, "Enter read_block_from_device\n");
dev->r_dlock();
ok = read_block_from_dev(dcr, check_block_numbers);
dev->dunlock();
- Dmsg0(200, "Leave read_block_from_device\n");
+ Dmsg0(250, "Leave read_block_from_device\n");
return ok;
}
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) {
if (stat < 0) {
berrno be;
dev->clrerror(-1);
- Dmsg1(200, "Read device got: ERR=%s\n", be.bstrerror());
+ Dmsg1(250, "Read device got: ERR=%s\n", be.bstrerror());
block->read_len = 0;
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());
}
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");
+ 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;
dev->lseek(dcr, pos, SEEK_SET);
dev->block_num = dcr->EndBlock;
dev->file = 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];
boffset_t pos = dev->lseek(dcr, (boffset_t)0, SEEK_CUR); /* get curr pos */
- Dmsg1(200, "Current lseek pos=%s\n", edit_int64(pos, ed1));
+ Dmsg1(250, "Current lseek pos=%s\n", edit_int64(pos, ed1));
pos -= (block->read_len - block->block_len);
dev->lseek(dcr, pos, SEEK_SET);
- Dmsg3(200, "Did lseek pos=%s blk_size=%d rdlen=%d\n",
+ 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