Add Bytes/Blocks read by SD during restore

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

diff --git a/bacula/src/stored/device.c b/bacula/src/stored/device.c
index 4dd374b1642c55cddb90098e5256cb48ebb9a3f6..f1d066c3a73b1ddd14a36d79c4502dcfbdd0e5fb 100644 (file)
--- a/bacula/src/stored/device.c
+++ b/bacula/src/stored/device.c
@@ -29,7 +29,7 @@
  *   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
@@ -79,7 +79,7 @@ int fixup_device_block_write_error(JCR *jcr, DEVICE *dev, DEV_BLOCK *block)
 
    wait_time = time(NULL);
    status_dev(dev, &stat);
-   if (stat & MT_EOD) {
+   if (stat & BMT_EOD) {
       Dmsg0(100, "======= Got EOD ========\n");
 
       block_device(dev, BST_DOING_ACQUIRE);
@@ -95,7 +95,7 @@ int fixup_device_block_write_error(JCR *jcr, DEVICE *dev, DEV_BLOCK *block)
         if (dev->state & ST_TAPE) {
            mjcr->EndBlock = dev->EndBlock;
            mjcr->EndFile  = dev->EndFile;
-            Dmsg2(000, "Fixup EndFile=%u EndBlock=%u\n", mjcr->EndFile, mjcr->EndBlock);
+            Dmsg2(200, "Fixup EndFile=%u EndBlock=%u\n", mjcr->EndFile, mjcr->EndBlock);
         } else {
            mjcr->EndBlock = (uint32_t)dev->file_addr;
            mjcr->EndFile = (uint32_t)(dev->file_addr >> 32);
@@ -107,14 +107,13 @@ int fixup_device_block_write_error(JCR *jcr, DEVICE *dev, DEV_BLOCK *block)
            unblock_device(dev);
            return 0;
         }
+        mjcr->VolFirstIndex = 0;      /* prevent writing jobmedia second time */
       }
 
       strcpy(dev->VolCatInfo.VolCatStatus, "Full");
-      Dmsg2(100, "Call update_vol_info Stat=%s Vol=%s\n", 
+      Dmsg2(200, "Call update_vol_info Stat=%s Vol=%s\n", 
         dev->VolCatInfo.VolCatStatus, dev->VolCatInfo.VolCatName);
       if (!dir_update_volume_info(jcr, &dev->VolCatInfo, 0)) {   /* send Volume info to Director */
-         Jmsg(jcr, M_ERROR, 0, _("Could not update Volume info Volume=%s Job=%s\n"),
-           dev->VolCatInfo.VolCatName, jcr->Job);
         P(dev->mutex);
         unblock_device(dev);
         return 0;                    /* device locked */
@@ -178,7 +177,8 @@ int fixup_device_block_write_error(JCR *jcr, DEVICE *dev, DEV_BLOCK *block)
            mjcr->StartBlock = (uint32_t)dev->file_addr;
            mjcr->StartFile  = (uint32_t)(dev->file_addr >> 32);
         }
-        mjcr->VolFirstFile = mjcr->JobFiles;
+        /* Set first FirstIndex for new Volume */
+        mjcr->VolFirstIndex = mjcr->JobFiles;
         mjcr->run_time += time(NULL) - wait_time; /* correct run time */
       }
       unblock_device(dev);