Update todo

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@550 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/kernstodo b/bacula/kernstodo
index 7b242d2c939b22706783acf7497dd01e454b48b1..9b70b938ec5fc6d37847696dbb875a93568198e0 100644 (file)
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -1,5 +1,5 @@
                  Kern's ToDo List
-                  20 May  2003 
+                  26 May  2003 
 
 Documentation to do: (any release a little bit at a time)
 - Document running a test version.
@@ -27,18 +27,11 @@ Testing to do: (painful)
 For 1.31 release:
 - If bootstrap is non-zero for restore, do not show JobId in the
   OK to run? (yes/mod/no): list.
-- If you enter the userid by hand for restore, you get:
-  Enter JobId(s), comma separated, to restore: 74
-  You have selected the following JobId: 74
-  Building directory tree for JobId 74 ...
-  134645140 items inserted into the tree and marked for extraction.
-
 - The bsr for Dan's job has file indexes covering the whole range rather
   than only the range contained on the volume.
   Constrain FileIndex to be within range for Volume.
 - Don't zero the Slot when the wrong volume is found -- simply ask
   the operator.
-- Add SDWriteSeqNo to SD, and probably Read on FD side.
 - Make sure all restore counters are working correctly in the FD.
 - When all cassettes in magazine are used, got:
   22-May-2003 18:24 undef-sd: 3304 Autochanger "load slot 1" status is OK.
@@ -60,7 +53,6 @@ For 1.31 release:
   they don't expect something in errmsg.
 - Fix Verify VolumeToCatalog to use BSRs -- it is broken.
 - Use switch() in backup.c and restore.c in FD instead of giant if statement.
-- Replace do_shell_expansion() with bpipe code.
 - Investigate doing RAW backup of Win32 partition.
 - Add JobName= to VerifyToCatalog so that all verifies can be done at the end.
 - Add thread specific data to hold the jcr -- send error messages from
@@ -915,3 +907,10 @@ Done: (see kernsdone for more)
 - Put system type returned by FD into catalog.
 - Finish WIN32_DATA stream code (bextract, check if can handle stream)
 - Make SD keep track of Files, Bytes during restore.
+- If you enter the userid by hand for restore, you get:
+  Enter JobId(s), comma separated, to restore: 74
+  You have selected the following JobId: 74
+  Building directory tree for JobId 74 ...
+  134645140 items inserted into the tree and marked for extraction.
+- Add SDWriteSeqNo to SD, and probably Read on FD side.
+

diff --git a/bacula/src/stored/block.c b/bacula/src/stored/block.c
index a7ca9e0980c6256df06846d64325f2b521d71749..95a424d24b84ca4d648c6ebffe3dafa79e814249 100644 (file)
--- a/bacula/src/stored/block.c
+++ b/bacula/src/stored/block.c
@@ -513,6 +513,9 @@ reread:
    }
    do {
       stat = read(dev->fd, block->buf, (size_t)block->buf_len);
+      if (retry == 1) {
+        dev->VolCatInfo.VolCatErrors++;   
+      }
    } while (stat == -1 && (errno == EINTR || errno == EIO) && retry++ < 6);
    if (stat < 0) {
       Dmsg1(90, "Read device got: ERR=%s\n", strerror(errno));

diff --git a/bacula/src/stored/dev.h b/bacula/src/stored/dev.h
index 449fd78994d9ebc8492b7ade521ec422d21a0929..a2b8dd631ca6bb97f4fff28f9b77b8194aadeb4b 100644 (file)
--- a/bacula/src/stored/dev.h
+++ b/bacula/src/stored/dev.h
@@ -112,7 +112,7 @@
 #define BST_MOUNT             6       /* Mount request */
 
 /* Volume Catalog Information structure definition */
-typedef struct s_volume_catalog_info {
+struct VOLUME_CAT_INFO {
    /* Media info for the current Volume */
    uint32_t VolCatJobs;               /* number of jobs on this Volume */
    uint32_t VolCatFiles;              /* Number of files */
@@ -131,7 +131,7 @@ typedef struct s_volume_catalog_info {
    uint64_t VolCatCapacityBytes;      /* capacity estimate */
    char VolCatStatus[20];             /* Volume status */
    char VolCatName[MAX_NAME_LENGTH];  /* Desired volume to mount */
-} VOLUME_CAT_INFO;
+};                
 
 
 typedef struct s_steal_lock {