X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=main.cc;h=f06f0188806693691dc01fe1592a2822de705032;hb=01776f600be2a246400d1e6e135b77f8e549c833;hp=5ac0f8c995429914b29560761d39f9e6155249c3;hpb=d862b5ab3900dc52a702a0fbff29adb24ac3ccec;p=cumulus.git

diff --git a/main.cc b/main.cc
index 5ac0f8c..f06f018 100644
--- a/main.cc
+++ b/main.cc
@@ -843,64 +843,23 @@ int main(int argc, char *argv[])
     tss->dump_stats();
     delete tss;
 
-    /* Write out a checksums file which lists the checksums for all the
-     * segments included in this snapshot.  The format is designed so that it
-     * may be easily verified using the sha1sums command. */
-    const char csum_type[] = "sha1";
-    string checksum_filename = "snapshot-";
-    if (backup_scheme.size() > 0)
-        checksum_filename += backup_scheme + "-";
-    checksum_filename
-        = checksum_filename + timestamp + "." + csum_type + "sums";
-    RemoteFile *checksum_file = remote->alloc_file(checksum_filename,
-                                                   "meta");
-    FILE *checksums = fdopen(checksum_file->get_fd(), "w");
-
-    std::set<string> segment_list = db->GetUsedSegments();
-    for (std::set<string>::iterator i = segment_list.begin();
-         i != segment_list.end(); ++i) {
-        map<string, string> segment_metadata = db->GetSegmentMetadata(*i);
-        if (segment_metadata.count("path")
-            && segment_metadata.count("checksum"))
-        {
-            string seg_path = segment_metadata["path"];
-            string seg_csum = segment_metadata["checksum"];
-            const char *raw_checksum = NULL;
-            if (strncmp(seg_csum.c_str(), csum_type,
-                        strlen(csum_type)) == 0) {
-                raw_checksum = seg_csum.c_str() + strlen(csum_type);
-                if (*raw_checksum == '=')
-                    raw_checksum++;
-                else
-                    raw_checksum = NULL;
-            }
-
-            if (raw_checksum != NULL)
-                fprintf(checksums, "%s *%s\n",
-                        raw_checksum, seg_path.c_str());
-        }
-    }
-    fclose(checksums);
-
-    SHA1Checksum checksum_csum;
-    string csum;
-    checksum_filename = checksum_file->get_local_path();
-    if (checksum_csum.process_file(checksum_filename.c_str())) {
-        csum = checksum_csum.checksum_str();
-    }
-
-    checksum_file->send();
-
     /* Write out a summary file with metadata for all the segments in this
-     * snapshot (can be used to reconstruct database contents if needed). */
+     * snapshot (can be used to reconstruct database contents if needed), and
+     * contains hash values for the segments for quick integrity checks. */
     string dbmeta_filename = "snapshot-";
     if (backup_scheme.size() > 0)
         dbmeta_filename += backup_scheme + "-";
-    dbmeta_filename += timestamp + ".meta";
-    RemoteFile *dbmeta_file = remote->alloc_file(dbmeta_filename,
-                                                   "meta");
-    FILE *dbmeta = fdopen(dbmeta_file->get_fd(), "w");
+    dbmeta_filename += timestamp + ".meta" + filter_extension;
+    RemoteFile *dbmeta_file = remote->alloc_file(dbmeta_filename, "meta");
+    FileFilter *dbmeta_filter = FileFilter::New(dbmeta_file->get_fd(),
+                                                filter_program);
+    if (dbmeta_filter == NULL) {
+        fprintf(stderr, "Unable to open descriptor output file: %m\n");
+        return 1;
+    }
+    FILE *dbmeta = fdopen(dbmeta_filter->get_wrapped_fd(), "w");
 
+    std::set<string> segment_list = db->GetUsedSegments();
     for (std::set<string>::iterator i = segment_list.begin();
          i != segment_list.end(); ++i) {
         map<string, string> segment_metadata = db->GetSegmentMetadata(*i);
@@ -916,6 +875,7 @@ int main(int argc, char *argv[])
         }
     }
     fclose(dbmeta);
+    dbmeta_filter->wait();
 
     string dbmeta_csum
         = Hash::hash_file(dbmeta_file->get_local_path().c_str());
@@ -940,19 +900,13 @@ int main(int argc, char *argv[])
 
     RemoteFile *descriptor_file = remote->alloc_file(desc_filename,
                                                      "snapshots");
-    int descriptor_fd = descriptor_file->get_fd();
-    if (descriptor_fd < 0) {
+    FileFilter *descriptor_filter = FileFilter::New(descriptor_file->get_fd(),
+                                                    signature_filter.c_str());
+    if (descriptor_filter == NULL) {
         fprintf(stderr, "Unable to open descriptor output file: %m\n");
         return 1;
     }
-    pid_t signature_pid = 0;
-    if (signature_filter.size() > 0) {
-        int new_fd = spawn_filter(descriptor_fd, signature_filter.c_str(),
-                                  &signature_pid);
-        close(descriptor_fd);
-        descriptor_fd = new_fd;
-    }
-    FILE *descriptor = fdopen(descriptor_fd, "w");
+    FILE *descriptor = fdopen(descriptor_filter->get_wrapped_fd(), "w");
 
     fprintf(descriptor, "Format: Cumulus Snapshot v0.11\n");
     fprintf(descriptor, "Producer: Cumulus %s\n", cumulus_version);
@@ -964,11 +918,7 @@ int main(int argc, char *argv[])
     fprintf(descriptor, "Root: %s\n", backup_root.c_str());
 
     if (dbmeta_csum.size() > 0) {
-        fprintf(descriptor, "Database-state: %s\n", dbmeta_csum.c_str());
-    }
-
-    if (csum.size() > 0) {
-        fprintf(descriptor, "Checksums: %s\n", csum.c_str());
+        fprintf(descriptor, "Segment-metadata: %s\n", dbmeta_csum.c_str());
     }
 
     fprintf(descriptor, "Segments:\n");
@@ -978,14 +928,8 @@ int main(int argc, char *argv[])
     }
 
     fclose(descriptor);
-
-    if (signature_pid) {
-        int status;
-        waitpid(signature_pid, &status, 0);
-
-        if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
-            fatal("Signature filter process error");
-        }
+    if (descriptor_filter->wait() < 0) {
+        fatal("Signature filter process error");
     }
 
     descriptor_file->send();