/* Responses sent to the File daemon */
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)
{
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;
+ bool ok = true;
DEVICE *dev = jcr->device->dev;
DEV_RECORD rec;
DEV_BLOCK *block;
/* Tell File daemon to send data */
bnet_fsend(fd_sock, OK_data);
- if (!jcr->no_attributes && jcr->spool_attributes) {
- open_spool_file(jcr, jcr->dir_bsock);
- }
+ begin_attribute_spool(jcr);
ds = fd_sock;
if (!bnet_set_buffer_size(ds, 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;
}
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
if (!(dev=acquire_device_for_append(jcr, dev, block))) {
set_jcr_job_status(jcr, JS_ErrorTerminated);
free_block(block);
+ discard_attribute_spool(jcr);
return 0;
}
Dmsg0(100, "Just after acquire_device_for_append\n");
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;
}
- memset(&rec, 0, sizeof(rec));
/*
* 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->VolFirstFile = 0;
- time(&jcr->run_time); /* start counting time for rates */
+ jcr->VolFirstIndex = jcr->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:
- * file_index (sequential Bacula file index)
- * stream (arbitrary Bacula number to distinguish parts of data)
+ * file_index (sequential Bacula file index, base 1)
+ * stream (Bacula number to distinguish parts of data)
* info (Info for Storage daemon -- compressed, encryped, ...)
* info is not currently used, so is read, but ignored!
*/
}
Jmsg1(jcr, M_FATAL, 0, _("Error reading data header from FD. ERR=%s\n"),
bnet_strerror(ds));
- ok = FALSE;
+ ok = false;
break;
}
- ds->msg[ds->msglen] = 0;
- if (sscanf(ds->msg, "%ld %ld %100s", &file_index, &stream, info) != 3) {
+
+ /*
+ * 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;
+ ok = false;
break;
}
+ stream = (int32_t)str_to_int64(p);
+
Dmsg2(190, "<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;
+ ok = false;
break;
}
if (file_index != last_file_index) {
jcr->JobFiles = file_index;
- if (jcr->VolFirstFile == 0) {
- jcr->VolFirstFile = file_index;
- }
last_file_index = file_index;
}
dev_name(dev), strerror_dev(dev));
Jmsg(jcr, M_FATAL, 0, _("Cannot fixup device error. %s\n"),
strerror_dev(dev));
- ok = FALSE;
+ ok = false;
break;
}
}
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_WIN32_ATTRIBUTES || stream == STREAM_SHA1_SIGNATURE) {
+ if (stream == STREAM_UNIX_ATTRIBUTES || stream == STREAM_MD5_SIGNATURE ||
+ stream == STREAM_UNIX_ATTRIBUTES_EX || stream == STREAM_SHA1_SIGNATURE) {
if (!jcr->no_attributes) {
- if (jcr->spool_attributes && jcr->dir_bsock->spool_fd) {
+ if (is_spooled(jcr)) {
jcr->dir_bsock->spool = 1;
}
Dmsg0(200, "Send attributes.\n");
if (!dir_update_file_attributes(jcr, &rec)) {
Jmsg(jcr, M_FATAL, 0, _("Error updating file attributes. ERR=%s\n"),
bnet_strerror(jcr->dir_bsock));
- ok = FALSE;
+ ok = false;
jcr->dir_bsock->spool = 0;
break;
}
if (is_bnet_error(ds)) {
Jmsg1(jcr, M_FATAL, 0, _("Network error on data channel. ERR=%s\n"),
bnet_strerror(ds));
- ok = FALSE;
+ 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 (!write_session_label(jcr, block, 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;
- }
- /* Write out final block of this session */
- if (!write_block_to_device(jcr, dev, block)) {
- Pmsg0(000, _("Set ok=FALSE after write_block_to_device.\n"));
- set_jcr_job_status(jcr, JS_ErrorTerminated);
- ok = FALSE;
+ /*
+ * 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));
+ set_jcr_job_status(jcr, JS_ErrorTerminated);
+ ok = false;
+ }
+ 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"));
+ set_jcr_job_status(jcr, JS_ErrorTerminated);
+ ok = false;
+ }
}
- 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)) {
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);
- }
+ commit_attribute_spool(jcr);
dir_send_job_status(jcr); /* update director */
- Dmsg0(90, "return from do_append_data()\n");
+ 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;
+}
projects / bacula / bacula / blobdiff