*
*/
/*
- 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"
return stat;
}
- if (!dcr->dev_locked) {
- lock_device(dev);
+ if (!dcr->dev_locked) { /* device already locked? */
+ lock_device(dev); /* no, lock it */
}
/*
}
bail_out:
- if (!dcr->dev_locked) {
- unlock_device(dev);
+ if (!dcr->dev_locked) { /* did we lock dev above? */
+ unlock_device(dev); /* unlock it now */
}
return stat;
}
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()) {
*/
int retry = 0;
errno = 0;
+ stat = 0;
do {
- if ((retry > 0 && stat == -1 && errno == EBUSY) || retry > 10) {
+ if (retry > 0 && stat == -1 && errno == EBUSY) {
berrno be;
- Dmsg4(100, "===== retry=%d stat=%d errno=%d: ERR=%s\n",
+ Dmsg4(100, "===== write retry=%d stat=%d errno=%d: ERR=%s\n",
retry, stat, errno, be.strerror());
- bmicrosleep(0, 50000); /* pause a bit if busy or lots of errors */
- }
- if (dev->is_tape()) {
- stat = tape_write(dev->fd, block->buf, (size_t)wlen);
- } else {
- stat = write(dev->fd, block->buf, (size_t)wlen);
+ 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) {
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);
* 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;
}
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 */
/* 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);
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)) {
}
}
- if (!dev->is_freespace_ok()) {
- update_free_space_dev(dev);
- }
+ dev->update_freespace();
if (!dev->is_freespace_ok()) { /* Error while getting free space */
char ed1[50], ed2[50];
JCR *jcr = dcr->jcr;
DEVICE *dev = dcr->dev;
DEV_BLOCK *block = dcr->block;
+
+ ASSERT(dev->is_open());
if (dev->at_eot()) {
return false;
return false;
}
-#define lots_of_debug
+// #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, "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);
errno = 0;
stat = 0;
do {
- if ((retry > 0 && stat == -1 && errno == EBUSY) || retry > 10) {
+ if ((retry > 0 && stat == -1 && errno == EBUSY)) {
berrno be;
- Dmsg4(100, "===== retry=%d stat=%d errno=%d: ERR=%s\n",
+ Dmsg4(100, "===== read retry=%d stat=%d errno=%d: ERR=%s\n",
retry, stat, errno, be.strerror());
- bmicrosleep(0, 50000); /* pause a bit if busy or lots of errors */
- }
- 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);
+ bmicrosleep(10, 0); /* pause a bit if busy or lots of errors */
+ dev->clrerror(-1);
}
- } while (stat == -1 && (errno == EBUSY || errno == EINTR || errno == EIO) && retry++ < 30);
+ 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->VolCatInfo.VolCatErrors++;
dev->clrerror(-1);
Dmsg1(200, "Read device got: ERR=%s\n", be.strerror());
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.strerror());
Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg);
if (dev->at_eof()) { /* EOF just seen? */
dev->set_eot(); /* yes, error => EOT */
}
} else {
Dmsg0(200, "Seek to beginning of block for reread.\n");
- off_t pos = dev->lseek(dcr, (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;
dev->lseek(dcr, pos, SEEK_SET);
dev->file_addr = pos;
dev->VolCatInfo.VolCatBytes += block->block_len;
dev->VolCatInfo.VolCatBlocks++;
if (dev->VolCatInfo.VolFirstWritten == 0) {
- dev->VolCatInfo.VolFirstWritten = time(NULL); /* Set first written time */
+ dev->VolCatInfo.VolFirstWritten = (utime_t)time(NULL); /* Set first written time */
}
dev->EndBlock = dev->block_num;
dev->EndFile = dev->file;
Dmsg0(200, "At end of read block\n");
if (block->read_len > block->block_len && !dev->is_tape()) {
char ed1[50];
- off_t pos = dev->lseek(dcr, (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);
dev->lseek(dcr, pos, SEEK_SET);
projects / bacula / bacula / blobdiff