X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=scandir.cc;h=3634b59e7d57ae0b83397299e04dd77b41b86f94;hb=58a0d3f8749111c15e9afa9d929016d65ed32250;hp=f8f6127cb62be40d9ba88b401f88f688cd1b0018;hpb=da87780779a2f165503d019ee0b59d10e5d31ec8;p=cumulus.git diff --git a/scandir.cc b/scandir.cc index f8f6127..3634b59 100644 --- a/scandir.cc +++ b/scandir.cc @@ -1,25 +1,26 @@ /* Recursively descend the filesystem and visit each file. */ -#include -#include -#include #include #include #include -#include +#include #include -#include +#include +#include +#include +#include #include +#include #include #include -#include -#include -#include -#include #include -#include +#include +#include #include +#include +#include +#include #include "format.h" #include "localdb.h" @@ -55,6 +56,9 @@ std::set segment_list; void scandir(const string& path); +/* Selection of files to include/exclude in the snapshot. */ +std::list excludes; + /* Ensure contents of metadata are flushed to an object. */ void metadata_flush() { @@ -64,7 +68,7 @@ void metadata_flush() /* Write current metadata information to a new object. */ LbsObject *meta = new LbsObject; - meta->set_group("root"); + meta->set_group("metadata"); meta->set_data(m.data(), m.size()); meta->write(tss); meta->checksum(); @@ -141,7 +145,20 @@ int64_t dumpfile(int fd, dictionary &file_info) // Store a copy of the object if one does not yet exist if (ref.get_segment().size() == 0) { LbsObject *o = new LbsObject; - o->set_group("data"); + + /* We might still have seen this checksum before, if the object was + * stored at some time in the past, but we have decided to clean + * the segment the object was originally stored in (FindObject will + * not return such objects). When rewriting the object contents, + * put it in a separate group, so that old objects get grouped + * together. The hope is that these old objects will continue to + * be used in the future, and we obtain segments which will + * continue to be well-utilized. */ + if (db->IsOldObject(block_csum, bytes)) + o->set_group("compacted"); + else + o->set_group("data"); + o->set_data(block_buf, bytes); o->write(tss); ref = o->get_ref(); @@ -177,7 +194,7 @@ int64_t dumpfile(int fd, dictionary &file_info) } LbsObject *i = new LbsObject; - i->set_group("indirect"); + i->set_group("metadata"); i->set_data(blocklist.data(), blocklist.size()); i->write(tss); file_info["data"] = "@" + i->get_name(); @@ -201,14 +218,22 @@ void scanfile(const string& path) // Set to true if the item is a directory and we should recursively scan bool recurse = false; + // Check this file against the include/exclude list to see if it should be + // considered + for (list::iterator i = excludes.begin(); + i != excludes.end(); ++i) { + if (path == *i) { + printf("Excluding %s\n", path.c_str()); + return; + } + } + dictionary file_info; lstat(path.c_str(), &stat_buf); printf("%s\n", path.c_str()); - metadata << "name: " << uri_encode(path) << "\n"; - file_info["mode"] = encode_int(stat_buf.st_mode & 07777); file_info["mtime"] = encode_int(stat_buf.st_mtime); file_info["user"] = encode_int(stat_buf.st_uid); @@ -271,8 +296,16 @@ void scanfile(const string& path) * - O_NONBLOCK: prevents open() from blocking if the file was * replaced by a fifo * We also add in O_NOATIME, since this may reduce disk writes (for - * inode updates). */ + * inode updates). However, O_NOATIME may result in EPERM, so if the + * initial open fails, try again without O_NOATIME. */ fd = open(path.c_str(), O_RDONLY|O_NOATIME|O_NOFOLLOW|O_NONBLOCK); + if (fd < 0) { + fd = open(path.c_str(), O_RDONLY|O_NOFOLLOW|O_NONBLOCK); + } + if (fd < 0) { + fprintf(stderr, "Unable to open file %s: %m\n", path.c_str()); + return; + } /* Drop the use of the O_NONBLOCK flag; we only wanted that for file * open. */ @@ -304,6 +337,7 @@ void scanfile(const string& path) file_info["type"] = string(1, inode_type); + metadata << "name: " << uri_encode(path) << "\n"; dict_output(metadata, file_info); metadata << "\n"; @@ -340,22 +374,89 @@ void scandir(const string& path) for (vector::iterator i = contents.begin(); i != contents.end(); ++i) { const string& filename = *i; - scanfile(path + "/" + filename); + if (path == ".") + scanfile(filename); + else + scanfile(path + "/" + filename); } closedir(dir); } -int main(int argc, char *argv[]) +void usage(const char *program) { - block_buf = new char[LBS_BLOCK_SIZE]; + fprintf(stderr, + "Usage: %s [OPTION]... SOURCE DEST\n" + "Produce backup snapshot of files in SOURCE and store to DEST.\n" + "\n" + "Options:\n" + " --exclude=PATH exclude files in PATH from snapshot\n" + " --localdb=PATH local backup metadata is stored in PATH\n", + program); +} +int main(int argc, char *argv[]) +{ + string backup_source = "."; string backup_dest = "."; + string localdb_dir = ""; + + while (1) { + static struct option long_options[] = { + {"localdb", 1, 0, 0}, // 0 + {"exclude", 1, 0, 0}, // 1 + {"filter", 1, 0, 0}, // 2 + {"filter-extension", 1, 0, 0}, // 3 + {NULL, 0, 0, 0}, + }; + + int long_index; + int c = getopt_long(argc, argv, "", long_options, &long_index); + + if (c == -1) + break; + + if (c == 0) { + switch (long_index) { + case 0: // --localdb + localdb_dir = optarg; + break; + case 1: // --exclude + excludes.push_back(optarg); + break; + case 2: // --filter + filter_program = optarg; + break; + case 3: // --filter-extension + filter_extension = optarg; + break; + default: + fprintf(stderr, "Unhandled long option!\n"); + return 1; + } + } else { + usage(argv[0]); + return 1; + } + } + + if (argc < optind + 2) { + usage(argv[0]); + return 1; + } - if (argc > 1) - backup_dest = argv[1]; + backup_source = argv[optind]; + backup_dest = argv[argc - 1]; + + if (localdb_dir == "") { + localdb_dir = backup_dest; + } + + printf("Source: %s, Dest: %s\n", + backup_source.c_str(), backup_dest.c_str()); tss = new TarSegmentStore(backup_dest); + block_buf = new char[LBS_BLOCK_SIZE]; /* 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 @@ -386,15 +487,16 @@ int main(int argc, char *argv[]) const string md = metadata_root.str(); LbsObject *root = new LbsObject; - root->set_group("root"); + root->set_group("metadata"); root->set_data(md.data(), md.size()); root->write(tss); root->checksum(); segment_list.insert(root->get_ref().get_segment()); - descriptor << "Root: " << root->get_ref().to_string() << "\n"; + descriptor << "Format: LBS Snapshot v0.1\n"; strftime(desc_buf, sizeof(desc_buf), "%Y-%m-%d %H:%M:%S %z", &time_buf); descriptor << "Date: " << desc_buf << "\n"; + descriptor << "Root: " << root->get_ref().to_string() << "\n"; delete root;