X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=scandir.cc;h=eb05243842668f5479c2dfffe005fadad88d94a6;hb=f1f817df56ce99ea544569635698df55d72bd1ee;hp=3a56d9c225a99f625590742a2f015c739289a1aa;hpb=0ab3b10e857ee5916f1765e3b8f773446cf4de45;p=cumulus.git diff --git a/scandir.cc b/scandir.cc index 3a56d9c..eb05243 100644 --- a/scandir.cc +++ b/scandir.cc @@ -26,6 +26,7 @@ #include "localdb.h" #include "metadata.h" +#include "remote.h" #include "store.h" #include "sha1.h" #include "util.h" @@ -43,6 +44,7 @@ using std::ostream; #define LBS_STRINGIFY2(s) #s static const char lbs_version[] = LBS_STRINGIFY(LBS_VERSION); +static RemoteStore *remote = NULL; static TarSegmentStore *tss = NULL; static MetadataWriter *metawriter = NULL; @@ -553,9 +555,13 @@ void usage(const char *program) "Produce backup snapshot of files in SOURCE and store to DEST.\n" "\n" "Options:\n" - " --dest=PATH path where backup is to be written [REQUIRED]\n" + " --dest=PATH path where backup is to be written\n" + " --upload-script=COMMAND\n" + " program to invoke for each backup file generated\n" " --exclude=PATH exclude files in PATH from snapshot\n" " --localdb=PATH local backup metadata is stored in PATH\n" + " --tmpdir=PATH path for temporarily storing backup files\n" + " (defaults to TMPDIR environment variable or /tmp)\n" " --filter=COMMAND program through which to filter segment data\n" " (defaults to \"bzip2 -c\")\n" " --filter-extension=EXT\n" @@ -565,18 +571,25 @@ void usage(const char *program) " program though which to filter descriptor\n" " --scheme=NAME optional name for this snapshot\n" " --intent=FLOAT intended backup type: 1=daily, 7=weekly, ...\n" - " (defaults to \"1\")\n", + " (defaults to \"1\")\n" + " --full-metadata do not re-use metadata from previous backups\n" + "\n" + "Exactly one of --dest or --upload-script must be specified.\n", lbs_version, program ); } int main(int argc, char *argv[]) { - string backup_dest = ""; + string backup_dest = "", backup_script = ""; string localdb_dir = ""; string backup_scheme = ""; string signature_filter = ""; + string tmp_dir = "/tmp"; + if (getenv("TMPDIR") != NULL) + tmp_dir = getenv("TMPDIR"); + while (1) { static struct option long_options[] = { {"localdb", 1, 0, 0}, // 0 @@ -587,6 +600,9 @@ int main(int argc, char *argv[]) {"scheme", 1, 0, 0}, // 5 {"signature-filter", 1, 0, 0}, // 6 {"intent", 1, 0, 0}, // 7 + {"full-metadata", 0, 0, 0}, // 8 + {"tmpdir", 1, 0, 0}, // 9 + {"upload-script", 1, 0, 0}, // 10 {NULL, 0, 0, 0}, }; @@ -627,6 +643,15 @@ int main(int argc, char *argv[]) if (snapshot_intent <= 0) snapshot_intent = 1; break; + case 8: // --full-metadata + flag_full_metadata = true; + break; + case 9: // --tmpdir + tmp_dir = optarg; + break; + case 10: // --upload-script + backup_script = optarg; + break; default: fprintf(stderr, "Unhandled long option!\n"); return 1; @@ -646,9 +671,16 @@ int main(int argc, char *argv[]) for (int i = optind; i < argc; i++) add_include(argv[i]); - if (backup_dest == "") { + if (backup_dest == "" && backup_script == "") { fprintf(stderr, - "Error: Backup destination must be specified with --dest=\n"); + "Error: Backup destination must be specified using --dest= or --upload-script=\n"); + usage(argv[0]); + return 1; + } + + if (backup_dest != "" && backup_script != "") { + fprintf(stderr, + "Error: Cannot specify both --dest= and --upload-script=\n"); usage(argv[0]); return 1; } @@ -657,6 +689,12 @@ int main(int argc, char *argv[]) if (localdb_dir == "") { localdb_dir = backup_dest; } + if (localdb_dir == "") { + fprintf(stderr, + "Error: Must specify local database path with --localdb=\n"); + usage(argv[0]); + return 1; + } // Dump paths for debugging/informational purposes { @@ -664,8 +702,8 @@ int main(int argc, char *argv[]) printf("LBS Version: %s\n", lbs_version); - printf("--dest=%s\n--localdb=%s\n\n", - backup_dest.c_str(), localdb_dir.c_str()); + printf("--dest=%s\n--localdb=%s\n--upload-script=%s\n", + backup_dest.c_str(), localdb_dir.c_str(), backup_script.c_str()); printf("Includes:\n"); for (i = includes.begin(); i != includes.end(); ++i) @@ -682,6 +720,22 @@ int main(int argc, char *argv[]) block_buf = new char[LBS_BLOCK_SIZE]; + /* Initialize the remote storage layer. If using an upload script, create + * a temporary directory for staging files. Otherwise, write backups + * directly to the destination directory. */ + if (backup_script != "") { + tmp_dir = tmp_dir + "/lbs." + generate_uuid(); + if (mkdir(tmp_dir.c_str(), 0700) < 0) { + fprintf(stderr, "Cannot create temporary directory %s: %m\n", + tmp_dir.c_str()); + return 1; + } + remote = new RemoteStore(tmp_dir); + remote->set_script(backup_script); + } else { + remote = new RemoteStore(backup_dest); + } + /* Store the time when the backup started, so it can be included in the * snapshot name. */ time_t now; @@ -700,7 +754,7 @@ int main(int argc, char *argv[]) backup_scheme.size() ? backup_scheme.c_str() : NULL, snapshot_intent); - tss = new TarSegmentStore(backup_dest, db); + tss = new TarSegmentStore(remote, db); /* Initialize the stat cache, for skipping over unchanged files. */ metawriter = new MetadataWriter(tss, localdb_dir.c_str(), desc_buf, @@ -724,48 +778,56 @@ int main(int argc, char *argv[]) * 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 = backup_dest + "/snapshot-"; + string checksum_filename = "snapshot-"; if (backup_scheme.size() > 0) checksum_filename += backup_scheme + "-"; checksum_filename = checksum_filename + desc_buf + "." + csum_type + "sums"; - FILE *checksums = fopen(checksum_filename.c_str(), "w"); - if (checksums != NULL) { - for (std::set::iterator i = segment_list.begin(); - i != segment_list.end(); ++i) { - string seg_path, seg_csum; - if (db->GetSegmentChecksum(*i, &seg_path, &seg_csum)) { - 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; - } + RemoteFile *checksum_file = remote->alloc_file(checksum_filename, + "checksums"); + FILE *checksums = fdopen(checksum_file->get_fd(), "w"); - if (raw_checksum != NULL) - fprintf(checksums, "%s *%s\n", - raw_checksum, seg_path.c_str()); + for (std::set::iterator i = segment_list.begin(); + i != segment_list.end(); ++i) { + string seg_path, seg_csum; + if (db->GetSegmentChecksum(*i, &seg_path, &seg_csum)) { + 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); - } else { - fprintf(stderr, "ERROR: Unable to write checksums file: %m\n"); } + fclose(checksums); + checksum_file->send(); db->Close(); + /* All other files should be flushed to remote storage before writing the + * backup descriptor below, so that it is not possible to have a backup + * descriptor written out depending on non-existent (not yet written) + * files. */ + remote->sync(); + /* Write a backup descriptor file, which says which segments are needed and * where to start to restore this snapshot. The filename is based on the * current time. If a signature filter program was specified, filter the * data through that to give a chance to sign the descriptor contents. */ - string desc_filename = backup_dest + "/snapshot-"; + string desc_filename = "snapshot-"; if (backup_scheme.size() > 0) desc_filename += backup_scheme + "-"; desc_filename = desc_filename + desc_buf + ".lbs"; - int descriptor_fd = open(desc_filename.c_str(), O_WRONLY | O_CREAT, 0666); + RemoteFile *descriptor_file = remote->alloc_file(desc_filename, + "snapshots"); + int descriptor_fd = descriptor_file->get_fd(); if (descriptor_fd < 0) { fprintf(stderr, "Unable to open descriptor output file: %m\n"); return 1; @@ -785,6 +847,7 @@ int main(int argc, char *argv[]) fprintf(descriptor, "Date: %s\n", desc_buf); if (backup_scheme.size() > 0) fprintf(descriptor, "Scheme: %s\n", backup_scheme.c_str()); + fprintf(descriptor, "Backup-Intent: %g\n", snapshot_intent); fprintf(descriptor, "Root: %s\n", backup_root.c_str()); SHA1Checksum checksum_csum; @@ -810,5 +873,18 @@ int main(int argc, char *argv[]) } } + descriptor_file->send(); + + remote->sync(); + delete remote; + + if (backup_script != "") { + if (rmdir(tmp_dir.c_str()) < 0) { + fprintf(stderr, + "Warning: Cannot delete temporary directory %s: %m\n", + tmp_dir.c_str()); + } + } + return 0; }