* 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
/* Responses sent to the File daemon */
static char OK_data[] = "3000 OK data\n";
-/*
- * Append Data sent from File daemon
+/* Forward referenced functions */
+
+/*
+ * Append Data sent from File daemon
*
*/
-int do_append_data(JCR *jcr)
+bool do_append_data(JCR *jcr)
{
int32_t n;
- long file_index, stream, last_file_index;
+ int32_t file_index, stream, last_file_index;
BSOCK *ds;
BSOCK *fd_sock = jcr->file_bsock;
- int ok = TRUE;
- DEVICE *dev = jcr->device->dev;
+ bool ok = true;
+ DEVICE *dev;
DEV_RECORD rec;
- DEV_BLOCK *block;
-
- Dmsg0(10, "Start append data.\n");
-
- /* Tell File daemon to send data */
- bnet_fsend(fd_sock, OK_data);
+ DCR *dcr;
- if (!jcr->no_attributes && jcr->spool_attributes) {
- open_spool_file(jcr, jcr->dir_bsock);
- }
+ Dmsg0(10, "Start append data.\n");
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"));
- 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);
- return 0;
+ return false;
+ }
+ dev = dcr->dev;
+ memset(&rec, 0, sizeof(rec));
+
+ if (dev->VolCatInfo.VolCatName[0] == 0) {
+ Dmsg0(000, "NULL Volume name. This shouldn't happen!!!\n");
}
+ 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");
+ if (dev->VolCatInfo.VolCatName[0] == 0) {
+ Dmsg0(000, "NULL Volume name. This shouldn't happen!!!\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;
+ ok = false;
+ }
+ if (dev->VolCatInfo.VolCatName[0] == 0) {
+ Dmsg0(000, "NULL Volume name. This shouldn't happen!!!\n");
}
+ /* Tell File daemon to send data */
+ if (!bnet_fsend(fd_sock, OK_data)) {
+ berrno be;
+ Jmsg1(jcr, M_FATAL, 0, _("Network send error to FD. ERR=%s\n"),
+ be.strerror(fd_sock->b_errno));
+ ok = false;
+ }
- /*
+ /*
* Get Data from File daemon, write to device. To clarify what is
- * going on here. We expect:
+ * going on here. We expect:
* - A stream header
* - Multiple records of data
* - EOD record
* none of the stream header is written to tape.
* The Multiple records of data, contain first the Attributes,
* then after another stream header, the file data, then
- * after another stream header, the MD5 data if any.
+ * after another stream header, the MD5 data if any.
*
* So we get the (stream header, data, EOD) three time for each
- * file. 1. for the Attributes, 2. for the file data if any,
+ * file. 1. for the Attributes, 2. for the file data if any,
* and 3. for the MD5 if any.
*/
- jcr->VolFirstIndex = 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); ) {
- char info[100];
/* Read Stream header from the File daemon.
* The stream header consists of the following:
if (n == BNET_SIGNAL && ds->msglen == BNET_EOD) {
break; /* end of data */
}
- Jmsg1(jcr, M_FATAL, 0, _("Error reading data header from FD. ERR=%s\n"),
- bnet_strerror(ds));
- ok = FALSE;
+ Jmsg1(jcr, M_FATAL, 0, _("Error reading data header from FD. ERR=%s\n"),
+ bnet_strerror(ds));
+ ok = false;
break;
}
- if (sscanf(ds->msg, "%ld %ld %100s", &file_index, &stream, info) != 3) {
- Jmsg1(jcr, M_FATAL, 0, _("Malformed data header from FD: %s\n"), ds->msg);
- ok = FALSE;
+
+ /*
+ * This hand scanning is a bit more complicated than a simple
+ * sscanf, but it allows us to handle any size integer up to
+ * int64_t without worrying about whether %d, %ld, %lld, or %q
+ * is the correct format for each different architecture.
+ * It is a real pity that sscanf() is not portable.
+ */
+ char *p = ds->msg;
+ while (B_ISSPACE(*p)) {
+ p++;
+ }
+ file_index = (int32_t)str_to_int64(p);
+ while (B_ISDIGIT(*p)) {
+ p++;
+ }
+ if (!B_ISSPACE(*p) || !B_ISDIGIT(*(p+1))) {
+ Jmsg1(jcr, M_FATAL, 0, _("Malformed data header from FD: %s\n"), ds->msg);
+ ok = false;
break;
}
- Dmsg2(190, "<filed: Header FilInx=%d stream=%d\n", file_index, stream);
+ stream = (int32_t)str_to_int64(p);
+
+ Dmsg2(890, "<filed: Header FilInx=%d stream=%d\n", file_index, stream);
if (!(file_index > 0 && (file_index == last_file_index ||
file_index == last_file_index + 1))) {
- Jmsg0(jcr, M_FATAL, 0, _("File index from FD not positive or sequential\n"));
- ok = FALSE;
+ Jmsg0(jcr, M_FATAL, 0, _("File index from FD not positive or sequential\n"));
+ ok = false;
break;
}
if (file_index != last_file_index) {
jcr->JobFiles = file_index;
- if (jcr->VolFirstIndex == 0) {
- jcr->VolFirstIndex = file_index;
- }
- jcr->VolLastIndex = file_index;
last_file_index = file_index;
}
-
+
/* Read data stream from the File daemon.
* 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.data_len = ds->msglen;
rec.data = ds->msg; /* use message buffer */
- Dmsg4(250, "before writ_rec FI=%d SessId=%d Strm=%s len=%d\n",
- rec.FileIndex, rec.VolSessionId, stream_to_ascii(rec.Stream,rec.FileIndex),
+ Dmsg4(850, "before writ_rec FI=%d SessId=%d Strm=%s len=%d\n",
+ rec.FileIndex, rec.VolSessionId, stream_to_ascii(rec.Stream,rec.FileIndex),
rec.data_len);
-
- while (!write_record_to_block(block, &rec)) {
- Dmsg2(150, "!write_record_to_block data_len=%d rem=%d\n", rec.data_len,
+
+ while (!write_record_to_block(dcr->block, &rec)) {
+ Dmsg2(850, "!write_record_to_block data_len=%d rem=%d\n", rec.data_len,
rec.remainder);
- if (!write_block_to_device(jcr, dev, block)) {
- Dmsg2(90, "Got write_block_to_dev error on device %s. %s\n",
+ 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;
+ ok = false;
break;
}
}
if (!ok) {
- Dmsg0(400, "Not OK\n");
+ Dmsg0(400, "Not OK\n");
break;
}
jcr->JobBytes += rec.data_len; /* increment bytes this job */
- Dmsg4(200, "write_record FI=%s SessId=%d Strm=%s len=%d\n",
- FI_to_ascii(rec.FileIndex), rec.VolSessionId,
+ Dmsg4(850, "write_record FI=%s SessId=%d Strm=%s len=%d\n",
+ FI_to_ascii(rec.FileIndex), rec.VolSessionId,
stream_to_ascii(rec.Stream, rec.FileIndex), rec.data_len);
/* Send attributes and MD5 to Director for Catalog */
if (stream == STREAM_UNIX_ATTRIBUTES || stream == STREAM_MD5_SIGNATURE ||
- stream == STREAM_UNIX_ATTRIBUTES_EX || stream == STREAM_SHA1_SIGNATURE) {
+ stream == STREAM_UNIX_ATTRIBUTES_EX || stream == STREAM_SHA1_SIGNATURE) {
if (!jcr->no_attributes) {
- if (jcr->spool_attributes && jcr->dir_bsock->spool_fd) {
- 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)) {
- Jmsg(jcr, M_FATAL, 0, _("Error updating file attributes. ERR=%s\n"),
+ Dmsg0(850, "Send attributes to dir.\n");
+ 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;
+ ok = false;
break;
}
- jcr->dir_bsock->spool = 0;
+ jcr->dir_bsock->spool = false;
}
}
+ Dmsg0(350, "Enter bnet_get\n");
}
+ Dmsg1(350, "End read loop with FD. Stat=%d\n", n);
if (is_bnet_error(ds)) {
- Jmsg1(jcr, M_FATAL, 0, _("Network error on data channel. ERR=%s\n"),
- bnet_strerror(ds));
- ok = FALSE;
+ Dmsg1(350, "Network read error from FD. ERR=%s\n", bnet_strerror(ds));
+ Jmsg1(jcr, M_FATAL, 0, _("Network error on data channel. ERR=%s\n"),
+ bnet_strerror(ds));
+ ok = false;
break;
}
}
- /*
- * We probably need a new flag that says "Do not attempt
- * to write because there is no tape".
- */
- Dmsg0(90, "Write_end_session_label()\n");
/* Create Job status for end of session label */
set_jcr_job_status(jcr, ok?JS_Terminated:JS_ErrorTerminated);
Dmsg1(200, "Write session label JobStatus=%d\n", jcr->JobStatus);
+ if (dev->VolCatInfo.VolCatName[0] == 0) {
+ Dmsg0(000, "NULL Volume name. This shouldn't happen!!!\n");
+ }
/*
* If !OK, check if we can still write. This may not be the case
* 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)) {
- Jmsg1(jcr, M_FATAL, 0, _("Error writting end session label. ERR=%s\n"),
- strerror_dev(dev));
+ 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);
- ok = FALSE;
+ ok = false;
+ }
+ if (dev->VolCatInfo.VolCatName[0] == 0) {
+ Dmsg0(000, "NULL Volume name. This shouldn't happen!!!\n");
}
+ 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)) {
- Dmsg0(100, _("Set ok=FALSE after write_block_to_device.\n"));
+ 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;
+ ok = false;
}
}
+ if (dev->VolCatInfo.VolCatName[0] == 0) {
+ Dmsg0(000, "NULL Volume name. This shouldn't happen!!!\n");
+ }
+
+ if (!ok) {
+ discard_data_spool(jcr);
+ } else {
+ commit_data_spool(jcr);
+ }
- Dmsg1(200, "release device JobStatus=%d\n", jcr->JobStatus);
+ 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;
+ ok = false;
}
- free_block(block);
-
- if (jcr->spool_attributes && jcr->dir_bsock->spool_fd) {
- bnet_despool(jcr->dir_bsock);
- close_spool_file(jcr, jcr->dir_bsock);
+ 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;
+ return ok;
}
projects / bacula / bacula / blobdiff