* Version $Id$
*/
/*
- Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker
+ Copyright (C) 2000-2003 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
/* Tell File daemon to send data */
bnet_fsend(fd_sock, OK_data);
- sm_check(__FILE__, __LINE__, False);
-
if (!jcr->no_attributes && jcr->spool_attributes) {
open_spool_file(jcr, jcr->dir_bsock);
}
ds = fd_sock;
if (!bnet_set_buffer_size(ds, MAX_NETWORK_BUFFER_SIZE, BNET_SETBUF_WRITE)) {
- jcr->JobStatus = JS_Cancelled;
+ set_jcr_job_status(jcr, JS_ErrorTerminated);
Jmsg(jcr, M_FATAL, 0, _("Unable to set network buffer size.\n"));
return 0;
}
* subroutine.
*/
Dmsg0(100, "just before acquire_device\n");
- if (!acquire_device_for_append(jcr, dev, block)) {
- jcr->JobStatus = JS_Cancelled;
+ if (!(dev=acquire_device_for_append(jcr, dev, block))) {
+ set_jcr_job_status(jcr, JS_ErrorTerminated);
free_block(block);
return 0;
}
- sm_check(__FILE__, __LINE__, False);
-
Dmsg0(100, "Just after acquire_device_for_append\n");
/*
* Write Begin Session Record
*/
if (!write_session_label(jcr, block, SOS_LABEL)) {
- jcr->JobStatus = JS_Cancelled;
Jmsg1(jcr, M_FATAL, 0, _("Write session label failed. ERR=%s\n"),
strerror_dev(dev));
+ set_jcr_job_status(jcr, JS_ErrorTerminated);
ok = FALSE;
}
- sm_check(__FILE__, __LINE__, False);
-
memset(&rec, 0, sizeof(rec));
/*
* file. 1. for the Attributes, 2. for the file data if any,
* and 3. for the MD5 if any.
*/
- jcr->VolFirstFile = 0;
+ jcr->VolFirstIndex = 0;
time(&jcr->run_time); /* start counting time for rates */
- for (last_file_index = 0; ok && !job_cancelled(jcr); ) {
+ for (last_file_index = 0; ok && !job_canceled(jcr); ) {
char info[100];
/* Read Stream header from the File daemon.
ok = FALSE;
break;
}
- sm_check(__FILE__, __LINE__, False);
ds->msg[ds->msglen] = 0;
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);
}
if (file_index != last_file_index) {
jcr->JobFiles = file_index;
- if (jcr->VolFirstFile == 0) {
- jcr->VolFirstFile = file_index;
+ if (jcr->VolFirstIndex == 0) {
+ jcr->VolFirstIndex = file_index;
}
last_file_index = file_index;
}
/* Read data stream from the File daemon.
* The data stream is just raw bytes
*/
- sm_check(__FILE__, __LINE__, False);
- while ((n=bget_msg(ds)) > 0 && !job_cancelled(jcr)) {
+ while ((n=bget_msg(ds)) > 0 && !job_canceled(jcr)) {
- sm_check(__FILE__, __LINE__, False);
rec.VolSessionId = jcr->VolSessionId;
rec.VolSessionTime = jcr->VolSessionTime;
rec.FileIndex = file_index;
break;
}
}
- sm_check(__FILE__, __LINE__, False);
if (!ok) {
Dmsg0(400, "Not OK\n");
break;
/* Send attributes and MD5 to Director for Catalog */
if (stream == STREAM_UNIX_ATTRIBUTES || stream == STREAM_MD5_SIGNATURE ||
- stream == STREAM_WIN32_ATTRIBUTES) {
+ stream == STREAM_WIN32_ATTRIBUTES || stream == STREAM_SHA1_SIGNATURE) {
if (!jcr->no_attributes) {
if (jcr->spool_attributes && jcr->dir_bsock->spool_fd) {
jcr->dir_bsock->spool = 1;
jcr->dir_bsock->spool = 0;
}
}
- sm_check(__FILE__, __LINE__, False);
}
if (is_bnet_error(ds)) {
Jmsg1(jcr, M_FATAL, 0, _("Network error on data channel. ERR=%s\n"),
* We probably need a new flag that says "Do not attempt
* to write because there is no tape".
*/
- sm_check(__FILE__, __LINE__, False);
Dmsg0(90, "Write_end_session_label()\n");
+
/* Create Job status for end of session label */
- if (!job_cancelled(jcr) && ok) {
- jcr->JobStatus = JS_Terminated;
- } else if (!ok) {
- jcr->JobStatus = JS_ErrorTerminated;
- }
- if (!write_session_label(jcr, block, EOS_LABEL)) {
- Jmsg1(jcr, M_FATAL, 0, _("Error writting end session label. ERR=%s\n"),
- strerror_dev(dev));
- 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"));
- ok = FALSE;
+ set_jcr_job_status(jcr, ok?JS_Terminated:JS_ErrorTerminated);
+
+ Dmsg1(200, "Write session label JobStatus=%d\n", jcr->JobStatus);
+
+ /*
+ * 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;
+ }
+ /* 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;
+ }
}
+ Dmsg1(200, "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;
}
close_spool_file(jcr, jcr->dir_bsock);
}
+ dir_send_job_status(jcr); /* update director */
+
Dmsg0(90, "return from do_append_data()\n");
return ok ? 1 : 0;
}