X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fstored%2Fappend.c;h=89953b466b066e6d136086025285b54cea0652c7;hb=c66d0785ff68244b8ce0b7ebb5817492448786c1;hp=8f6e71bb617a0cc6f8047becab72b633fabec07b;hpb=fce6a648a27ee86f6941a5085ec7909f6d43e725;p=bacula%2Fbacula

diff --git a/bacula/src/stored/append.c b/bacula/src/stored/append.c
index 8f6e71bb61..89953b466b 100644
--- a/bacula/src/stored/append.c
+++ b/bacula/src/stored/append.c
@@ -5,22 +5,17 @@
  *  Version $Id$
  */
 /*
-   Copyright (C) 2000-2005 Kern Sibbald
+   Copyright (C) 2000-2006 Kern Sibbald
 
    This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
+   modify it under the terms of the GNU General Public License
+   version 2 as amended with additional clauses defined in the
+   file LICENSE in the main source directory.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public
-   License along with this program; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
+   the file LICENSE for additional details.
 
  */
 
@@ -45,11 +40,23 @@ bool do_append_data(JCR *jcr)
    BSOCK *fd_sock = jcr->file_bsock;
    bool ok = true;
    DEV_RECORD rec;
+   char buf1[100], buf2[100];
    DCR *dcr = jcr->dcr;
-   DEVICE *dev = dcr->dev;
+   DEVICE *dev;
+   char ec[50];
+
 
+   if (!dcr) { 
+      Jmsg0(jcr, M_FATAL, 0, _("DCR is NULL!!!\n"));
+      return false;
+   }                                              
+   dev = dcr->dev;
+   if (!dev) { 
+      Jmsg0(jcr, M_FATAL, 0, _("DEVICE is NULL!!!\n"));
+      return false;
+   }                                              
 
-   Dmsg0(100, "Start append data.\n");
+   Dmsg1(100, "Start append data. res=%d\n", dev->reserved_device);
 
    memset(&rec, 0, sizeof(rec));
 
@@ -57,12 +64,13 @@ bool do_append_data(JCR *jcr)
 
    if (!bnet_set_buffer_size(ds, dcr->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"));
+      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->dcr = NULL;
       return false;
    }
 
@@ -72,7 +80,7 @@ bool do_append_data(JCR *jcr)
    if (dev->VolCatInfo.VolCatName[0] == 0) {
       Pmsg0(000, _("NULL Volume name. This shouldn't happen!!!\n"));
    }
-   Dmsg1(20, "Begin append device=%s\n", dev->print_name());
+   Dmsg1(50, "Begin append device=%s\n", dev->print_name());
 
    begin_data_spool(dcr);
    begin_attribute_spool(jcr);
@@ -86,7 +94,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"),
-         strerror_dev(dev));
+         dev->bstrerror());
       set_jcr_job_status(jcr, JS_ErrorTerminated);
       ok = false;
    }
@@ -187,7 +195,8 @@ bool do_append_data(JCR *jcr)
          rec.data = ds->msg;            /* use message buffer */
 
          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.FileIndex, rec.VolSessionId, 
+            stream_to_ascii(buf1, rec.Stream,rec.FileIndex),
             rec.data_len);
 
          while (!write_record_to_block(dcr->block, &rec)) {
@@ -195,9 +204,7 @@ bool do_append_data(JCR *jcr)
                        rec.remainder);
             if (!write_block_to_device(dcr)) {
                Dmsg2(90, "Got write_block_to_dev error on device %s. %s\n",
-                  dev->print_name(), strerror_dev(dev));
-               Jmsg2(jcr, M_FATAL, 0, _("Fatal append error on device %s: ERR=%s\n"),
-                     dev->print_name(), strerror_dev(dev));
+                  dev->print_name(), dev->bstrerror());
                ok = false;
                break;
             }
@@ -208,12 +215,12 @@ bool do_append_data(JCR *jcr)
          }
          jcr->JobBytes += rec.data_len;   /* increment bytes this job */
          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);
+            FI_to_ascii(buf1, rec.FileIndex), rec.VolSessionId,
+            stream_to_ascii(buf2, 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) {
+         /* Send attributes and digest to Director for Catalog */
+         if (stream == STREAM_UNIX_ATTRIBUTES || stream == STREAM_UNIX_ATTRIBUTES_EX ||
+             crypto_digest_stream_type(stream) != CRYPTO_DIGEST_NONE) {
             if (!jcr->no_attributes) {
                if (are_attributes_spooled(jcr)) {
                   jcr->dir_bsock->spool = true;
@@ -232,6 +239,7 @@ bool do_append_data(JCR *jcr)
          Dmsg0(650, "Enter bnet_get\n");
       }
       Dmsg1(650, "End read loop with FD. Stat=%d\n", n);
+
       if (is_bnet_error(ds)) {
          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"),
@@ -241,13 +249,20 @@ bool do_append_data(JCR *jcr)
       }
    }
 
+   time_t job_elapsed = time(NULL) - jcr->run_time;
+
+   if (job_elapsed <= 0) {
+      job_elapsed = 1;
+   }
+
+   Jmsg(dcr->jcr, M_INFO, 0, _("Job write elapsed time = %02d:%02d:%02d, Transfer rate = %s bytes/second\n"),
+         job_elapsed / 3600, job_elapsed % 3600 / 60, job_elapsed % 60,
+         edit_uint64_with_suffix(jcr->JobBytes / job_elapsed, ec));
+
    /* 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 ((!ok || job_canceled(jcr)) && dev->VolCatInfo.VolCatName[0] == 0) {
-      Pmsg0(000, _("NULL Volume name. This shouldn't happen!!!\n"));
-   }
+   Dmsg1(200, "Write EOS label JobStatus=%c\n", jcr->JobStatus);
 
    /*
     * If !OK, check if we can still write. This may not be the case
@@ -256,7 +271,7 @@ bool do_append_data(JCR *jcr)
    if (ok || dev->can_write()) {
       if (!write_session_label(dcr, EOS_LABEL)) {
          Jmsg1(jcr, M_FATAL, 0, _("Error writting end session label. ERR=%s\n"),
-               strerror_dev(dev));
+               dev->bstrerror());
          set_jcr_job_status(jcr, JS_ErrorTerminated);
          ok = false;
       }
@@ -267,7 +282,7 @@ bool do_append_data(JCR *jcr)
       /* Flush out final partial block of this session */
       if (!write_block_to_device(dcr)) {
          Jmsg2(jcr, M_FATAL, 0, _("Fatal append error on device %s: ERR=%s\n"),
-               dev->print_name(), strerror_dev(dev));
+               dev->print_name(), dev->bstrerror());
          Dmsg0(100, _("Set ok=FALSE after write_block_to_device.\n"));
          ok = false;
       }
@@ -279,6 +294,7 @@ bool do_append_data(JCR *jcr)
    if (!ok) {
       discard_data_spool(dcr);
    } else {
+      /* Note: if commit is OK, the device will remain locked */
       commit_data_spool(dcr);
    }
 
@@ -286,7 +302,10 @@ bool do_append_data(JCR *jcr)
       ok = dvd_close_job(dcr);  /* do DVD cleanup if any */
    }
    
-   /* Release the device -- and send final Vol info to DIR */
+   /*
+    * Release the device -- and send final Vol info to DIR
+    *  and unlock it.
+    */
    release_device(dcr);
 
    if (!ok || job_canceled(jcr)) {