if (object_group == 0) {
o->set_group("data");
} else {
- char group[32];
- sprintf(group, "compacted-%d", object_group);
- o->set_group(group);
+ o->set_group(string_printf("compacted-%d",
+ object_group));
}
if (status == NULL)
status = "partial";
/* Store the time when the backup started, so it can be included in the
* snapshot name. */
time_t now;
- struct tm time_buf_local, time_buf_utc;
- char desc_buf[256];
time(&now);
- localtime_r(&now, &time_buf_local);
- gmtime_r(&now, &time_buf_utc);
- strftime(desc_buf, sizeof(desc_buf), "%Y%m%dT%H%M%S", &time_buf_utc);
+ string timestamp
+ = TimeFormat::format(now, TimeFormat::FORMAT_FILENAME, true);
/* Open the local database which tracks all objects that are stored
* remotely, for efficient incrementals. Provide it with the name of this
* snapshot. */
string database_path = localdb_dir + "/localdb.sqlite";
db = new LocalDb;
- db->Open(database_path.c_str(), desc_buf, backup_scheme.c_str());
+ db->Open(database_path.c_str(), timestamp.c_str(), backup_scheme.c_str());
tss = new TarSegmentStore(remote, db);
/* Initialize the stat cache, for skipping over unchanged files. */
- metawriter = new MetadataWriter(tss, localdb_dir.c_str(), desc_buf,
+ metawriter = new MetadataWriter(tss, localdb_dir.c_str(), timestamp.c_str(),
backup_scheme.c_str());
for (int i = optind; i < argc; i++) {
string checksum_filename = "snapshot-";
if (backup_scheme.size() > 0)
checksum_filename += backup_scheme + "-";
- checksum_filename = checksum_filename + desc_buf + "." + csum_type + "sums";
+ 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) {
- string seg_path, seg_csum;
- if (db->GetSegmentMetadata(*i, &seg_path, &seg_csum)) {
+ 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) {
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). */
+ string dbmeta_filename = "snapshot-";
+ if (backup_scheme.size() > 0)
+ dbmeta_filename += backup_scheme + "-";
+ 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");
+
+ 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.size() > 0) {
+ map<string, string>::const_iterator j;
+ for (j = segment_metadata.begin();
+ j != segment_metadata.end(); ++j)
+ {
+ fprintf(dbmeta, "%s: %s\n",
+ j->first.c_str(), j->second.c_str());
+ }
+ fprintf(dbmeta, "\n");
+ }
+ }
+ fclose(dbmeta);
+
+ string dbmeta_csum
+ = Hash::hash_file(dbmeta_file->get_local_path().c_str());
+ dbmeta_file->send();
+
db->Close();
/* All other files should be flushed to remote storage before writing the
string desc_filename = "snapshot-";
if (backup_scheme.size() > 0)
desc_filename += backup_scheme + "-";
- desc_filename = desc_filename + desc_buf + ".cumulus";
+ desc_filename = desc_filename + timestamp + ".cumulus";
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);
- strftime(desc_buf, sizeof(desc_buf), "%Y-%m-%d %H:%M:%S %z",
- &time_buf_local);
- fprintf(descriptor, "Date: %s\n", desc_buf);
+ string timestamp_local
+ = TimeFormat::format(now, TimeFormat::FORMAT_LOCALTIME, false);
+ fprintf(descriptor, "Date: %s\n", timestamp_local.c_str());
if (backup_scheme.size() > 0)
fprintf(descriptor, "Scheme: %s\n", backup_scheme.c_str());
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());
}
}
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();
projects / cumulus.git / blobdiff