* Version $Id$
*/
/*
- Copyright (C) 2000-2003 Kern Sibbald and John Walker
+ Copyright (C) 2000-2004 Kern Sibbald and John Walker
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
static char OK_data[] = "3000 OK data\n";
/* Forward referenced functions */
-static bool is_spooled(JCR *jcr);
-static int begin_attribute_spool(JCR *jcr);
-static int discard_attribute_spool(JCR *jcr);
-static int commit_attribute_spool(JCR *jcr);
/*
* Append Data sent from File daemon
*
*/
-int do_append_data(JCR *jcr)
+bool do_append_data(JCR *jcr)
{
int32_t n;
int32_t file_index, stream, last_file_index;
BSOCK *ds;
BSOCK *fd_sock = jcr->file_bsock;
bool ok = true;
- DEVICE *dev = jcr->device->dev;
+ DEVICE *dev;
DEV_RECORD rec;
- DEV_BLOCK *block;
+ DCR *dcr;
Dmsg0(10, "Start append data.\n");
- /* Tell File daemon to send data */
- bnet_fsend(fd_sock, OK_data);
-
- begin_attribute_spool(jcr);
-
ds = fd_sock;
- if (!bnet_set_buffer_size(ds, MAX_NETWORK_BUFFER_SIZE, BNET_SETBUF_WRITE)) {
+ if (!bnet_set_buffer_size(ds, jcr->device->max_network_buffer_size, BNET_SETBUF_WRITE)) {
set_jcr_job_status(jcr, JS_ErrorTerminated);
Jmsg(jcr, M_FATAL, 0, _("Unable to set network buffer size.\n"));
- discard_attribute_spool(jcr);
- return 0;
+ return false;
}
- Dmsg1(20, "Begin append device=%s\n", dev_name(dev));
-
- block = new_block(dev);
- memset(&rec, 0, sizeof(rec));
-
/*
* Acquire output device for writing. Note, after acquiring a
* device, we MUST release it, which is done at the end of this
* subroutine.
*/
Dmsg0(100, "just before acquire_device\n");
- if (!(dev=acquire_device_for_append(jcr, dev, block))) {
+ if (!(dcr=acquire_device_for_append(jcr))) {
set_jcr_job_status(jcr, JS_ErrorTerminated);
- free_block(block);
- discard_attribute_spool(jcr);
- return 0;
+ return false;
}
+ dev = dcr->dev;
+ memset(&rec, 0, sizeof(rec));
+
+ Dmsg1(20, "Begin append device=%s\n", dev_name(dev));
+
+ begin_data_spool(jcr);
+ begin_attribute_spool(jcr);
+
Dmsg0(100, "Just after acquire_device_for_append\n");
/*
* Write Begin Session Record
*/
- if (!write_session_label(jcr, block, SOS_LABEL)) {
+ if (!write_session_label(dcr, SOS_LABEL)) {
Jmsg1(jcr, M_FATAL, 0, _("Write session label failed. ERR=%s\n"),
strerror_dev(dev));
set_jcr_job_status(jcr, JS_ErrorTerminated);
ok = false;
}
+ /* Tell File daemon to send data */
+ bnet_fsend(fd_sock, OK_data);
/*
* Get Data from File daemon, write to device. To clarify what is
* file. 1. for the Attributes, 2. for the file data if any,
* and 3. for the MD5 if any.
*/
- jcr->VolFirstIndex = jcr->VolLastIndex = 0;
+ dcr->VolFirstIndex = dcr->VolLastIndex = 0;
jcr->run_time = time(NULL); /* start counting time for rates */
for (last_file_index = 0; ok && !job_canceled(jcr); ) {
* The data stream is just raw bytes
*/
while ((n=bget_msg(ds)) > 0 && !job_canceled(jcr)) {
-
rec.VolSessionId = jcr->VolSessionId;
rec.VolSessionTime = jcr->VolSessionTime;
rec.FileIndex = file_index;
rec.FileIndex, rec.VolSessionId, stream_to_ascii(rec.Stream,rec.FileIndex),
rec.data_len);
- while (!write_record_to_block(block, &rec)) {
+ while (!write_record_to_block(dcr->block, &rec)) {
Dmsg2(150, "!write_record_to_block data_len=%d rem=%d\n", rec.data_len,
rec.remainder);
- if (!write_block_to_device(jcr, dev, block)) {
+ if (!write_block_to_device(dcr)) {
Dmsg2(90, "Got write_block_to_dev error on device %s. %s\n",
dev_name(dev), strerror_dev(dev));
- Jmsg(jcr, M_FATAL, 0, _("Cannot fixup device error. %s\n"),
+ Jmsg(jcr, M_FATAL, 0, _("Fatal device error: ERR=%s\n"),
strerror_dev(dev));
ok = false;
break;
if (stream == STREAM_UNIX_ATTRIBUTES || stream == STREAM_MD5_SIGNATURE ||
stream == STREAM_UNIX_ATTRIBUTES_EX || stream == STREAM_SHA1_SIGNATURE) {
if (!jcr->no_attributes) {
- if (is_spooled(jcr)) {
- jcr->dir_bsock->spool = 1;
+ if (are_attributes_spooled(jcr)) {
+ jcr->dir_bsock->spool = true;
}
Dmsg0(200, "Send attributes.\n");
- if (!dir_update_file_attributes(jcr, &rec)) {
+ if (!dir_update_file_attributes(dcr, &rec)) {
+ jcr->dir_bsock->spool = false;
Jmsg(jcr, M_FATAL, 0, _("Error updating file attributes. ERR=%s\n"),
bnet_strerror(jcr->dir_bsock));
ok = false;
- jcr->dir_bsock->spool = 0;
break;
}
- jcr->dir_bsock->spool = 0;
+ jcr->dir_bsock->spool = false;
}
}
}
* if we are at the end of the tape or we got a fatal I/O error.
*/
if (ok || dev_can_write(dev)) {
- if (!write_session_label(jcr, block, EOS_LABEL)) {
+ if (!write_session_label(dcr, EOS_LABEL)) {
Jmsg1(jcr, M_FATAL, 0, _("Error writting end session label. ERR=%s\n"),
strerror_dev(dev));
set_jcr_job_status(jcr, JS_ErrorTerminated);
}
Dmsg0(90, "back from write_end_session_label()\n");
/* Flush out final partial block of this session */
- if (!write_block_to_device(jcr, dev, block)) {
+ if (!write_block_to_device(dcr)) {
Dmsg0(100, _("Set ok=FALSE after write_block_to_device.\n"));
set_jcr_job_status(jcr, JS_ErrorTerminated);
ok = false;
}
}
+ if (!ok) {
+ discard_data_spool(jcr);
+ } else {
+ commit_data_spool(jcr);
+ }
+
Dmsg1(200, "calling release device JobStatus=%d\n", jcr->JobStatus);
/* Release the device */
- if (!release_device(jcr, dev)) {
+ if (!release_device(jcr)) {
Pmsg0(000, _("Error in release_device\n"));
set_jcr_job_status(jcr, JS_ErrorTerminated);
ok = false;
}
- free_block(block);
-
- commit_attribute_spool(jcr);
+ if (!ok) {
+ discard_attribute_spool(jcr);
+ } else {
+ commit_attribute_spool(jcr);
+ }
dir_send_job_status(jcr); /* update director */
Dmsg1(100, "return from do_append_data() stat=%d\n", ok);
- return ok ? 1 : 0;
-}
-
-static bool is_spooled(JCR *jcr)
-{
- return jcr->spool_attributes && jcr->dir_bsock->spool_fd;
-}
-
-static int begin_attribute_spool(JCR *jcr)
-{
- if (!jcr->no_attributes && jcr->spool_attributes) {
- return open_spool_file(jcr, jcr->dir_bsock);
- }
- return 1;
-}
-
-static int discard_attribute_spool(JCR *jcr)
-{
- if (is_spooled(jcr)) {
- return close_spool_file(jcr, jcr->dir_bsock);
- }
- return 1;
-}
-
-static int commit_attribute_spool(JCR *jcr)
-{
- if (is_spooled(jcr)) {
- bnet_despool(jcr->dir_bsock);
- return close_spool_file(jcr, jcr->dir_bsock);
- }
- return 1;
+ return ok;
}
projects / bacula / bacula / blobdiff