X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fstored%2Fblock.c;h=2db124e5ba57c7b97d586988a4ea29ed9239caf7;hb=8ec0de6a73f09501ee0d8da46a40d46b4c41d26a;hp=0cf0ea40f2d1b5f0b29f8136cb31f740adc4e530;hpb=87e0ff974632b7dbee33ffdf59f420c21e358abc;p=bacula%2Fbacula diff --git a/bacula/src/stored/block.c b/bacula/src/stored/block.c index 0cf0ea40f2..2db124e5ba 100644 --- a/bacula/src/stored/block.c +++ b/bacula/src/stored/block.c @@ -9,19 +9,32 @@ * */ /* - Copyright (C) 2001-2006 Kern Sibbald + Bacula® - The Network Backup Solution - 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. + Copyright (C) 2001-2007 Free Software Foundation Europe e.V. - 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. + 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. - */ + 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 John Walker. + The licensor of Bacula is the Free Software Foundation Europe + (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich, + Switzerland, email:ftf@fsfeurope.org. +*/ #include "bacula.h" @@ -332,8 +345,8 @@ bool write_block_to_device(DCR *dcr) return stat; } - if (!dcr->dev_locked) { - lock_device(dev); + if (!dcr->dev_locked) { /* device already locked? */ + dev->r_dlock(); /* no, lock it */ } /* @@ -374,8 +387,8 @@ bool write_block_to_device(DCR *dcr) } bail_out: - if (!dcr->dev_locked) { - unlock_device(dev); + if (!dcr->dev_locked) { /* did we lock dev above? */ + dev->dunlock(); /* unlock it now */ } return stat; } @@ -401,6 +414,7 @@ bool write_block_to_dev(DCR *dcr) return true; #endif ASSERT(block->binbuf == ((uint32_t) (block->bufp - block->buf))); + ASSERT(dev->is_open()); /* dump_block(block, "before write"); */ if (dev->at_weot()) { @@ -513,16 +527,19 @@ bool write_block_to_dev(DCR *dcr) * I/O errors, or from the OS telling us it is busy. */ int retry = 0; + errno = 0; + stat = 0; do { - if (dev->is_tape()) { - stat = tape_write(dev->fd, block->buf, (size_t)wlen); - } else { - stat = write(dev->fd, block->buf, (size_t)wlen); - } - if (retry > 10) { - bmicrosleep(0, 100000); /* pause a bit if lots of errors */ + 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); } - } while (stat == -1 && (errno == EBUSY || errno == EIO) && retry++ < 30); + 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) { @@ -544,8 +561,9 @@ bool write_block_to_dev(DCR *dcr) 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 */ @@ -556,7 +574,7 @@ bool write_block_to_dev(DCR *dcr) 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->fd(), wlen, stat, dev->block_num, block->BlockNumber, dev->dev_errno, strerror(dev->dev_errno)); ok = terminate_writing_volume(dcr); @@ -570,8 +588,9 @@ bool write_block_to_dev(DCR *dcr) } /* 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; @@ -621,33 +640,33 @@ static void reread_last_block(DCR *dcr) * 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. */ } @@ -707,7 +726,6 @@ static bool terminate_writing_volume(DCR *dcr) } 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()) { if (!dvd_write_part(dcr)) { /* write last part */ @@ -740,7 +758,7 @@ static bool terminate_writing_volume(DCR *dcr) /* 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); @@ -765,11 +783,11 @@ static bool do_new_file_bookkeeping(DCR *dcr) 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; + 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; } dev->VolCatInfo.VolCatFiles = dev->file; if (!dir_update_volume_info(dcr, false)) { @@ -836,6 +854,8 @@ static bool do_dvd_size_checks(DCR *dcr) return false; } } + + dev->update_freespace(); if (!dev->is_freespace_ok()) { /* Error while getting free space */ char ed1[50], ed2[50]; @@ -876,9 +896,9 @@ bool read_block_from_device(DCR *dcr, bool check_block_numbers) bool ok; DEVICE *dev = dcr->dev; Dmsg0(200, "Enter read_block_from_device\n"); - lock_device(dev); + dev->r_dlock(); ok = read_block_from_dev(dcr, check_block_numbers); - unlock_device(dev); + dev->dunlock(); Dmsg0(200, "Leave read_block_from_device\n"); return ok; } @@ -897,12 +917,14 @@ bool read_block_from_dev(DCR *dcr, bool check_block_numbers) JCR *jcr = dcr->jcr; DEVICE *dev = dcr->dev; DEV_BLOCK *block = dcr->block; + + 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(200, "Full read in read_block_from_device() len=%d\n", block->buf_len); reread: if (looping > 1) { @@ -914,22 +936,26 @@ reread: 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_dvd_parts=%u\n", (unsigned int)dev->num_dvd_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_dvd_parts > 0 && - dev->part < dev->num_dvd_parts) { + 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()); @@ -939,30 +965,26 @@ reread: } 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)); - - if (dev->is_tape()) { - stat = tape_read(dev->fd, block->buf, (size_t)block->buf_len); - } else { - stat = read(dev->fd, block->buf, (size_t)block->buf_len); + 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); } + stat = dev->read(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++; - } - } while (stat == -1 && (errno == EINTR || errno == EIO) && retry++ < 11); + } 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(200, "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 */ @@ -1026,9 +1048,9 @@ reread: } } 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 */ + 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); @@ -1059,8 +1081,6 @@ reread: 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++; @@ -1095,11 +1115,12 @@ reread: Dmsg0(200, "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(200, "Current lseek pos=%s\n", edit_int64(pos, ed1)); pos -= (block->read_len - block->block_len); - lseek_dev(dev, pos, SEEK_SET); + dev->lseek(dcr, pos, SEEK_SET); Dmsg3(200, "Did lseek pos=%s blk_size=%d rdlen=%d\n", - edit_uint64(pos, ed1), block->block_len, + edit_int64(pos, ed1), block->block_len, block->read_len); dev->file_addr = pos; dev->file_size = pos;