/*
Bacula® - The Network Backup Solution
- Copyright (C) 2001-2010 Free Software Foundation Europe e.V.
+ Copyright (C) 2001-2012 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
+ modify it under the terms of version three of the GNU Affero General Public
License as published by the Free Software Foundation and included
in the file LICENSE.
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
+ You should have received a copy of the GNU Affero 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.
* : false on failure
*
*/
-bool write_block_to_device(DCR *dcr)
+bool DCR::write_block_to_device()
{
bool stat = true;
- DEVICE *dev = dcr->dev;
- JCR *jcr = dcr->jcr;
+ DCR *dcr = this;
if (dcr->spooling) {
stat = write_block_to_spool_file(dcr);
}
}
- if (!write_block_to_dev(dcr)) {
+ if (!dcr->write_block_to_dev()) {
if (job_canceled(jcr) || jcr->getJobType() == JT_SYSTEM) {
- if (jcr->getJobType() != JT_SYSTEM) {
- terminate_writing_volume(dcr);
- }
stat = false;
} else {
stat = fixup_device_block_write_error(dcr);
* Returns: true on success or EOT
* false on hard error
*/
-bool write_block_to_dev(DCR *dcr)
+bool DCR::write_block_to_dev()
{
ssize_t stat = 0;
uint32_t wlen; /* length to write */
int hit_max1, hit_max2;
bool ok = true;
- DEVICE *dev = dcr->dev;
- JCR *jcr = dcr->jcr;
- DEV_BLOCK *block = dcr->block;
+ DCR *dcr = this;
#ifdef NO_TAPE_WRITE_TEST
empty_block(block);
return true;
#endif
if (job_canceled(jcr)) {
- terminate_writing_volume(dcr);
return false;
}
dev->file_size = 0; /* reset file size */
if (!dev->weof(1)) { /* write eof */
- Dmsg0(190, "WEOF error in max file size.\n");
+ Dmsg0(50, "WEOF error in max file size.\n");
Jmsg(jcr, M_FATAL, 0, _("Unable to write EOF. ERR=%s\n"),
dev->bstrerror());
terminate_writing_volume(dcr);
DEV_BLOCK *lblock = new_block(dev);
/* Note, this can destroy dev->errmsg */
dcr->block = lblock;
- if (!read_block_from_dev(dcr, NO_BLOCK_NUMBER_CHECK)) {
+ if (!dcr->read_block_from_dev(NO_BLOCK_NUMBER_CHECK)) {
Jmsg(jcr, M_ERROR, 0, _("Re-read last block at EOT failed. ERR=%s"),
dev->errmsg);
} else {
DEVICE *dev = dcr->dev;
bool ok = true;
- if (dev->at_eot()) {
- return true;
- }
-
/* Create a JobMedia record to indicated end of tape */
dev->VolCatInfo.VolCatFiles = dev->file;
if (!dir_create_jobmedia_record(dcr)) {
- Dmsg0(190, "Error from create JobMedia\n");
+ Dmsg0(50, "Error from create JobMedia\n");
dev->dev_errno = EIO;
Jmsg2(dcr->jcr, M_FATAL, 0, _("Could not create JobMedia record for Volume=\"%s\" Job=%s\n"),
dcr->getVolCatName(), dcr->jcr->Job);
Jmsg(dcr->jcr, M_ERROR, 0, _("Error writing final EOF to tape. This Volume may not be readable.\n"
"%s"), dev->errmsg);
ok = false;
- Dmsg0(100, "WEOF error.\n");
+ Dmsg0(50, "Error writing final EOF to volume.\n");
}
if (ok) {
ok = write_ansi_ibm_labels(dcr, ANSI_EOV_LABEL, dev->VolHdr.VolumeName);
if (!dir_update_volume_info(dcr, false, true)) {
ok = false;
+ Dmsg0(50, "Error updating volume info.\n");
}
- Dmsg1(100, "dir_update_volume_info terminate writing -- %s\n", ok?"OK":"ERROR");
+ Dmsg1(50, "dir_update_volume_info terminate writing -- %s\n", ok?"OK":"ERROR");
/*
* Walk through all attached dcrs setting flag to call
dev->VolCatInfo.VolCatErrors++;
/* This may not be fatal since we already wrote an EOF */
Jmsg(dcr->jcr, M_ERROR, 0, "%s", dev->errmsg);
+ Dmsg0(50, "Writing second EOF failed.\n");
}
dev->set_ateot(); /* no more writing this tape */
/* Create a JobMedia record so restore can seek */
if (!dir_create_jobmedia_record(dcr)) {
- Dmsg0(190, "Error from create_job_media.\n");
+ Dmsg0(50, "Error from create_job_media.\n");
dev->dev_errno = EIO;
Jmsg2(jcr, M_FATAL, 0, _("Could not create JobMedia record for Volume=\"%s\" Job=%s\n"),
dcr->getVolCatName(), jcr->Job);
}
dev->VolCatInfo.VolCatFiles = dev->file;
if (!dir_update_volume_info(dcr, false, false)) {
- Dmsg0(190, "Error from update_vol_info.\n");
+ Dmsg0(50, "Error from update_vol_info.\n");
terminate_writing_volume(dcr);
dev->dev_errno = EIO;
return false;
* Read block with locking
*
*/
-bool read_block_from_device(DCR *dcr, bool check_block_numbers)
+bool DCR::read_block_from_device(bool check_block_numbers)
{
bool ok;
- DEVICE *dev = dcr->dev;
+
Dmsg0(250, "Enter read_block_from_device\n");
dev->r_dlock();
- ok = read_block_from_dev(dcr, check_block_numbers);
+ ok = read_block_from_dev(check_block_numbers);
dev->dunlock();
Dmsg0(250, "Leave read_block_from_device\n");
return ok;
* the block header. For a file, the block may be partially
* or completely in the current buffer.
*/
-bool read_block_from_dev(DCR *dcr, bool check_block_numbers)
+bool DCR::read_block_from_dev(bool check_block_numbers)
{
ssize_t stat;
int looping;
- uint32_t BlockNumber;
int retry;
- JCR *jcr = dcr->jcr;
- DEVICE *dev = dcr->dev;
- DEV_BLOCK *block = dcr->block;
+ DCR *dcr = this;
if (job_canceled(jcr)) {
return false;
return false; /* return error */
}
- BlockNumber = block->BlockNumber + 1;
+// BlockNumber = block->BlockNumber + 1;
if (!unser_block_header(jcr, dev, block)) {
if (forge_on) {
dev->file_addr += block->read_len;
projects / bacula / bacula / blobdiff