X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=scandir.cc;h=f119197ff6b1ec8cb0f5547094c1e155791425e5;hb=2911a4279cce1e880793c934ce90a187856c7c92;hp=ac013a8497d7b01c80271bcacdc3d6eaeb80b3a1;hpb=4a4d316953123fbb7c2dd076939fb1ba2a4fc29b;p=cumulus.git

diff --git a/scandir.cc b/scandir.cc
index ac013a8..f119197 100644
--- a/scandir.cc
+++ b/scandir.cc
@@ -30,6 +30,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <sys/stat.h>
 #include <sys/sysmacros.h>
 #include <sys/types.h>
@@ -95,6 +96,11 @@ std::list<string> searches;         // Directories we don't want to save, but
 
 bool relative_paths = true;
 
+bool flag_rebuild_statcache = false;
+
+/* Whether verbose output is enabled. */
+bool verbose = false;
+
 /* Ensure that the given segment is listed as a dependency of the current
  * snapshot. */
 void add_segment(const string& segment)
@@ -150,7 +156,9 @@ int64_t dumpfile(int fd, dictionary &file_info, const string &path,
     if (found)
         old_blocks = metawriter->get_blocks();
 
-    if (found && metawriter->is_unchanged(&stat_buf)) {
+    if (found
+        && !flag_rebuild_statcache
+        && metawriter->is_unchanged(&stat_buf)) {
         cached = true;
 
         /* If any of the blocks in the object have been expired, then we should
@@ -262,6 +270,10 @@ int64_t dumpfile(int fd, dictionary &file_info, const string &path,
                 subfile.analyze_new_block(block_buf, bytes);
                 refs = subfile.create_incremental(tss, o, block_age);
             } else {
+                if (flag_rebuild_statcache && ref.is_normal()) {
+                    subfile.analyze_new_block(block_buf, bytes);
+                    subfile.store_analyzed_signatures(ref);
+                }
                 refs.push_back(ref);
             }
 
@@ -281,7 +293,25 @@ int64_t dumpfile(int fd, dictionary &file_info, const string &path,
         file_info["checksum"] = hash.checksum_str();
     }
 
-    if (status != NULL)
+    // Sanity check: if we are rebuilding the statcache, but the file looks
+    // like it hasn't changed, then the newly-computed checksum should match
+    // the checksum in the statcache.  If not, we have possible disk corruption
+    // and report a warning.
+    if (flag_rebuild_statcache) {
+        if (found
+            && metawriter->is_unchanged(&stat_buf)
+            && file_info["checksum"] != metawriter->get_checksum()) {
+            fprintf(stderr,
+                    "Warning: Checksum for %s does not match expected value\n"
+                    "    expected: %s\n"
+                    "    actual:   %s\n",
+                    path.c_str(),
+                    metawriter->get_checksum().c_str(),
+                    file_info["checksum"].c_str());
+        }
+    }
+
+    if (verbose && status != NULL)
         printf("    [%s]\n", status);
 
     string blocklist = "";
@@ -309,7 +339,8 @@ void dump_inode(const string& path,         // Path within snapshot
     int64_t file_size;
     ssize_t len;
 
-    printf("%s\n", path.c_str());
+    if (verbose)
+        printf("%s\n", path.c_str());
     metawriter->find(path);
 
     file_info["name"] = uri_encode(path);
@@ -603,6 +634,8 @@ void usage(const char *program)
         "  --intent=FLOAT       intended backup type: 1=daily, 7=weekly, ...\n"
         "                           (defaults to \"1\")\n"
         "  --full-metadata      do not re-use metadata from previous backups\n"
+        "  --rebuild-statcache  re-read all file data to verify statcache\n"
+        "  -v --verbose         list files as they are backed up\n"
         "\n"
         "Exactly one of --dest or --upload-script must be specified.\n",
         cumulus_version, program
@@ -633,11 +666,14 @@ int main(int argc, char *argv[])
             {"full-metadata", 0, 0, 0},     // 8
             {"tmpdir", 1, 0, 0},            // 9
             {"upload-script", 1, 0, 0},     // 10
+            {"rebuild-statcache", 0, 0, 0}, // 11
+            // Aliases for short options
+            {"verbose", 0, 0, 'v'},
             {NULL, 0, 0, 0},
         };
 
         int long_index;
-        int c = getopt_long(argc, argv, "", long_options, &long_index);
+        int c = getopt_long(argc, argv, "v", long_options, &long_index);
 
         if (c == -1)
             break;
@@ -682,13 +718,22 @@ int main(int argc, char *argv[])
             case 10:    // --upload-script
                 backup_script = optarg;
                 break;
+            case 11:    // --rebuild-statcache
+                flag_rebuild_statcache = true;
+                break;
             default:
                 fprintf(stderr, "Unhandled long option!\n");
                 return 1;
             }
         } else {
-            usage(argv[0]);
-            return 1;
+            switch (c) {
+            case 'v':
+                verbose = true;
+                break;
+            default:
+                usage(argv[0]);
+                return 1;
+            }
         }
     }
 
@@ -854,7 +899,7 @@ int main(int argc, char *argv[])
     }
     FILE *descriptor = fdopen(descriptor_fd, "w");
 
-    fprintf(descriptor, "Format: LBS Snapshot v0.6\n");
+    fprintf(descriptor, "Format: LBS Snapshot v0.8\n");
     fprintf(descriptor, "Producer: Cumulus %s\n", cumulus_version);
     strftime(desc_buf, sizeof(desc_buf), "%Y-%m-%d %H:%M:%S %z", &time_buf);
     fprintf(descriptor, "Date: %s\n", desc_buf);
@@ -880,7 +925,7 @@ int main(int argc, char *argv[])
         waitpid(signature_pid, &status, 0);
 
         if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
-            throw IOException("Signature filter process error");
+            fatal("Signature filter process error");
         }
     }