update configure

[bacula/bacula] / bacula / src / stored / append.c

diff --git a/bacula/src/stored/append.c b/bacula/src/stored/append.c
index 72bf6ab1ac4ab7b7c9d5106f53ca40afe768e32e..1af03fb822624758c2b9028a27d7766300760fa1 100644 (file)
--- a/bacula/src/stored/append.c
+++ b/bacula/src/stored/append.c
@@ -43,24 +43,9 @@ static char OK_append[]  = "3000 OK append data\n";
 
 
 /* 
- * Check if we can mark this job incomplete
- *
  */
 void possible_incomplete_job(JCR *jcr, int32_t last_file_index)
 {
-   /*
-    * Note, here we decide if it is worthwhile to restart
-    *  the Job at this point. For the moment, if at least
-    *  10 Files have been seen, which is good for testing, but
-    *  for a production system, we probably want something like
-    *  100-1000 files, and some number of bytes of data.
-    *
-    *  ****FIXME**** set last_file_index to something more
-    *    reasonable, and maybe check JobBytes.
-    */
-   if (jcr->spool_attributes && last_file_index > 10) {
-      jcr->setJobStatus(JS_Incomplete);
-   }
 }
 /*
  *  Append Data sent from File daemon
@@ -94,17 +79,17 @@ bool do_append_data(JCR *jcr)
    memset(&rec, 0, sizeof(rec));
 
    if (!fd->set_buffer_size(dcr->device->max_network_buffer_size, BNET_SETBUF_WRITE)) {
-      set_jcr_job_status(jcr, JS_ErrorTerminated);
+      jcr->setJobStatus(JS_ErrorTerminated);
       Jmsg0(jcr, M_FATAL, 0, _("Unable to set network buffer size.\n"));
       return false;
    }
 
    if (!acquire_device_for_append(dcr)) {
-      set_jcr_job_status(jcr, JS_ErrorTerminated);
+      jcr->setJobStatus(JS_ErrorTerminated);
       return false;
    }
 
-   set_jcr_job_status(jcr, JS_Running);
+   jcr->setJobStatus(JS_Running);
    dir_send_job_status(jcr);
 
    if (dev->VolCatInfo.VolCatName[0] == 0) {
@@ -125,7 +110,7 @@ bool do_append_data(JCR *jcr)
    if (!write_session_label(dcr, SOS_LABEL)) {
       Jmsg1(jcr, M_FATAL, 0, _("Write session label failed. ERR=%s\n"),
          dev->bstrerror());
-      set_jcr_job_status(jcr, JS_ErrorTerminated);
+      jcr->setJobStatus(JS_ErrorTerminated);
       ok = false;
    }
    if (dev->VolCatInfo.VolCatName[0] == 0) {
@@ -193,7 +178,7 @@ bool do_append_data(JCR *jcr)
        * An incomplete job can start the file_index at any number.
        * otherwise, it must start at 1.
        */
-      if (jcr->incomplete && file_index > 0 && last_file_index == 0) {
+      if (jcr->rerunning && file_index > 0 && last_file_index == 0) {
          goto fi_checked;
       }
       if (file_index > 0 && (file_index == last_file_index ||
@@ -266,7 +251,7 @@ fi_checked:
    }
 
    /* Create Job status for end of session label */
-   set_jcr_job_status(jcr, ok?JS_Terminated:JS_ErrorTerminated);
+   jcr->setJobStatus(ok?JS_Terminated:JS_ErrorTerminated);
 
    if (ok) {
       /* Terminate connection with FD */
@@ -305,7 +290,7 @@ fi_checked:
                   dev->bstrerror());
             possible_incomplete_job(jcr, last_file_index);
          }
-         set_jcr_job_status(jcr, JS_ErrorTerminated);
+         jcr->setJobStatus(JS_ErrorTerminated);
          ok = false;
       }
       if (dev->VolCatInfo.VolCatName[0] == 0) {
@@ -322,7 +307,7 @@ fi_checked:
             Dmsg0(100, _("Set ok=FALSE after write_block_to_device.\n"));
             possible_incomplete_job(jcr, last_file_index);
          }
-         set_jcr_job_status(jcr, JS_ErrorTerminated);
+         jcr->setJobStatus(JS_ErrorTerminated);
          ok = false;
       }
    }