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()) {
* I/O errors, or from the OS telling us it is busy.
*/
int retry = 0;
+ errno = 0;
+ stat = 0;
do {
+ if ((retry > 0 && stat == -1 && errno == EBUSY) || retry > 10) {
+ berrno be;
+ Dmsg4(100, "===== read retry=%d stat=%d errno=%d: ERR=%s\n",
+ retry, stat, errno, be.strerror());
+ bmicrosleep(0, 100000); /* pause a bit if busy or lots of errors */
+ dev->clrerror(-1);
+ }
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 */
- }
} while (stat == -1 && (errno == EBUSY || errno == EIO) && retry++ < 30);
#ifdef DEBUG_BLOCK_ZEROING
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());
}
}
/* 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;
* 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 (dev->is_dvd()) {
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;
}
return false;
}
}
+
+ if (!dev->is_freespace_ok()) {
+ update_free_space_dev(dev);
+ }
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;
}
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) {
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());
}
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 ((retry > 0 && stat == -1 && errno == EBUSY) || retry > 10) {
+ berrno be;
+ Dmsg4(100, "===== write retry=%d stat=%d errno=%d: ERR=%s\n",
+ retry, stat, errno, be.strerror());
+ bmicrosleep(0, 100000); /* pause a bit if busy or lots of errors */
+ dev->clrerror(-1);
+ }
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);
}
-
-// 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++ < 30);
if (stat < 0) {
berrno be;
dev->clrerror(-1);
}
} 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 */
+ off_t pos = dev->lseek(dcr, (off_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.VolCatBytes += block->block_len;
dev->VolCatInfo.VolCatBlocks++;
+ if (dev->VolCatInfo.VolFirstWritten == 0) {
+ dev->VolCatInfo.VolFirstWritten = time(NULL); /* Set first written time */
+ }
dev->EndBlock = dev->block_num;
dev->EndFile = dev->file;
dev->block_num++;
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 */
+ off_t pos = dev->lseek(dcr, (off_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;