X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=scandir.cc;h=d462432417b4459c5d69c8b693ddc8794dd322c5;hb=048815121720c9cfb0bc8df48efd9aa0c846e3d0;hp=92c9a4d5db575de7fbc2a2281121fd8158465a71;hpb=dfb3bcd8cbcc6aa8737deddd332884e23d0e4b22;p=cumulus.git diff --git a/scandir.cc b/scandir.cc index 92c9a4d..d462432 100644 --- a/scandir.cc +++ b/scandir.cc @@ -1,4 +1,25 @@ -/* Recursively descend the filesystem and visit each file. */ +/* Cumulus: Smart Filesystem Backup to Dumb Servers + * + * Copyright (C) 2006-2008 The Regents of the University of California + * Written by Michael Vrable + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +/* Main entry point for LBS. Contains logic for traversing the filesystem and + * constructing a backup. */ #include #include @@ -29,6 +50,7 @@ #include "remote.h" #include "store.h" #include "sha1.h" +#include "subfile.h" #include "util.h" using std::list; @@ -118,17 +140,23 @@ int64_t dumpfile(int fd, dictionary &file_info, const string &path, /* Look up this file in the old stat cache, if we can. If the stat * information indicates that the file has not changed, do not bother - * re-reading the entire contents. */ + * re-reading the entire contents. Even if the information has been + * changed, we can use the list of old blocks in the search for a sub-block + * incremental representation. */ bool cached = false; + list old_blocks; - if (metawriter->find(path) && metawriter->is_unchanged(&stat_buf)) { + bool found = metawriter->find(path); + if (found) + old_blocks = metawriter->get_blocks(); + + if (found && metawriter->is_unchanged(&stat_buf)) { cached = true; - list blocks = metawriter->get_blocks(); /* If any of the blocks in the object have been expired, then we should * fall back to fully reading in the file. */ - for (list::const_iterator i = blocks.begin(); - i != blocks.end(); ++i) { + for (list::const_iterator i = old_blocks.begin(); + i != old_blocks.end(); ++i) { const ObjectReference &ref = *i; if (!db->IsAvailable(ref)) { cached = false; @@ -140,8 +168,8 @@ int64_t dumpfile(int fd, dictionary &file_info, const string &path, /* If everything looks okay, use the cached information */ if (cached) { file_info["checksum"] = metawriter->get_checksum(); - for (list::const_iterator i = blocks.begin(); - i != blocks.end(); ++i) { + for (list::const_iterator i = old_blocks.begin(); + i != old_blocks.end(); ++i) { const ObjectReference &ref = *i; object_list.push_back(ref.to_string()); if (ref.is_normal()) @@ -156,6 +184,9 @@ int64_t dumpfile(int fd, dictionary &file_info, const string &path, * time. */ if (!cached) { SHA1Checksum hash; + Subfile subfile(db); + subfile.load_old_blocks(old_blocks); + while (true) { ssize_t bytes = file_read(fd, block_buf, LBS_BLOCK_SIZE); if (bytes == 0) @@ -194,6 +225,8 @@ int64_t dumpfile(int fd, dictionary &file_info, const string &path, ref = db->FindObject(block_csum, bytes); } + list refs; + // Store a copy of the object if one does not yet exist if (ref.is_null()) { LbsObject *o = new LbsObject; @@ -226,18 +259,19 @@ int64_t dumpfile(int fd, dictionary &file_info, const string &path, status = "new"; } - o->set_data(block_buf, bytes); - o->write(tss); - ref = o->get_ref(); - db->StoreObject(ref, block_csum, bytes, block_age); - ref.set_range(0, bytes); - delete o; + subfile.analyze_new_block(block_buf, bytes); + refs = subfile.create_incremental(tss, o, block_age); + } else { + refs.push_back(ref); } - object_list.push_back(ref.to_string()); - if (ref.is_normal()) - add_segment(ref.get_segment()); - db->UseObject(ref); + while (!refs.empty()) { + ref = refs.front(); refs.pop_front(); + object_list.push_back(ref.to_string()); + if (ref.is_normal()) + add_segment(ref.get_segment()); + db->UseObject(ref); + } size += bytes; if (status == NULL) @@ -394,7 +428,6 @@ void scanfile(const string& path, bool include) for (list::iterator i = includes.begin(); i != includes.end(); ++i) { if (path == *i) { - printf("Including %s\n", path.c_str()); include = true; } } @@ -402,7 +435,6 @@ void scanfile(const string& path, bool include) for (list::iterator i = excludes.begin(); i != excludes.end(); ++i) { if (path == *i) { - printf("Excluding %s\n", path.c_str()); include = false; } } @@ -410,7 +442,6 @@ void scanfile(const string& path, bool include) for (list::iterator i = searches.begin(); i != searches.end(); ++i) { if (path == *i) { - printf("Scanning %s\n", path.c_str()); scan_only = true; } } @@ -511,7 +542,6 @@ void scanfile(const string& path, bool include) * themselves are excluded from being backed up. */ void add_include(const char *path) { - printf("Add: %s\n", path); /* Was an absolute path specified? If so, we'll need to start scanning * from the root directory. Make sure that the user was consistent in * providing either all relative paths or all absolute paths. */ @@ -555,9 +585,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" @@ -568,18 +602,24 @@ void usage(const char *program) " --scheme=NAME optional name for this snapshot\n" " --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", + " --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 @@ -591,6 +631,8 @@ int main(int argc, char *argv[]) {"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}, }; @@ -634,6 +676,12 @@ int main(int argc, char *argv[]) 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; @@ -653,9 +701,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 using --dest= or --upload-script=\n"); + usage(argv[0]); + return 1; + } + + if (backup_dest != "" && backup_script != "") { fprintf(stderr, - "Error: Backup destination must be specified with --dest=\n"); + "Error: Cannot specify both --dest= and --upload-script=\n"); usage(argv[0]); return 1; } @@ -664,33 +719,30 @@ int main(int argc, char *argv[]) if (localdb_dir == "") { localdb_dir = backup_dest; } - - // Dump paths for debugging/informational purposes - { - list::const_iterator i; - - printf("LBS Version: %s\n", lbs_version); - - printf("--dest=%s\n--localdb=%s\n\n", - backup_dest.c_str(), localdb_dir.c_str()); - - printf("Includes:\n"); - for (i = includes.begin(); i != includes.end(); ++i) - printf(" %s\n", i->c_str()); - - printf("Excludes:\n"); - for (i = excludes.begin(); i != excludes.end(); ++i) - printf(" %s\n", i->c_str()); - - printf("Searching:\n"); - for (i = searches.begin(); i != searches.end(); ++i) - printf(" %s\n", i->c_str()); + if (localdb_dir == "") { + fprintf(stderr, + "Error: Must specify local database path with --localdb=\n"); + usage(argv[0]); + return 1; } block_buf = new char[LBS_BLOCK_SIZE]; - /* Initialize the remote storage layer. */ - remote = new RemoteStore(backup_dest); + /* 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. */ @@ -706,17 +758,14 @@ int main(int argc, char *argv[]) * snapshot. */ string database_path = localdb_dir + "/localdb.sqlite"; db = new LocalDb; - db->Open(database_path.c_str(), desc_buf, - backup_scheme.size() ? backup_scheme.c_str() : NULL, + db->Open(database_path.c_str(), desc_buf, backup_scheme.c_str(), snapshot_intent); tss = new TarSegmentStore(remote, db); /* Initialize the stat cache, for skipping over unchanged files. */ metawriter = new MetadataWriter(tss, localdb_dir.c_str(), desc_buf, - backup_scheme.size() - ? backup_scheme.c_str() - : NULL); + backup_scheme.c_str()); scanfile(".", false); @@ -738,7 +787,8 @@ int main(int argc, char *argv[]) if (backup_scheme.size() > 0) checksum_filename += backup_scheme + "-"; checksum_filename = checksum_filename + desc_buf + "." + csum_type + "sums"; - RemoteFile *checksum_file = remote->alloc_file(checksum_filename); + RemoteFile *checksum_file = remote->alloc_file(checksum_filename, + "checksums"); FILE *checksums = fdopen(checksum_file->get_fd(), "w"); for (std::set::iterator i = segment_list.begin(); @@ -780,7 +830,8 @@ int main(int argc, char *argv[]) desc_filename += backup_scheme + "-"; desc_filename = desc_filename + desc_buf + ".lbs"; - RemoteFile *descriptor_file = remote->alloc_file(desc_filename); + 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"); @@ -832,5 +883,13 @@ int main(int argc, char *argv[]) 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; }