#include <vector>
#include "localdb.h"
+#include "metadata.h"
#include "store.h"
#include "sha1.h"
#include "statcache.h"
static const char lbs_version[] = LBS_STRINGIFY(LBS_VERSION);
static TarSegmentStore *tss = NULL;
+static MetadataWriter *metawriter = NULL;
/* Buffer for holding a single block of data read from a file. */
static const size_t LBS_BLOCK_SIZE = 1024 * 1024;
static char *block_buf;
-static const size_t LBS_METADATA_BLOCK_SIZE = 65536;
-
/* Local database, which tracks objects written in this and previous
* invocations to help in creating incremental snapshots. */
LocalDb *db;
* skipping files which have not changed. */
StatCache *statcache;
-/* Contents of the root object. This will contain a set of indirect links to
- * the metadata objects. */
-std::ostringstream metadata_root;
-
-/* Buffer for building up metadata. */
-std::ostringstream metadata;
-
/* Keep track of all segments which are needed to reconstruct the snapshot. */
std::set<string> segment_list;
bool relative_paths = true;
-/* Ensure contents of metadata are flushed to an object. */
-void metadata_flush()
+/* Ensure that the given segment is listed as a dependency of the current
+ * snapshot. */
+void add_segment(const string& segment)
{
- string m = metadata.str();
- if (m.size() == 0)
- return;
-
- /* Write current metadata information to a new object. */
- LbsObject *meta = new LbsObject;
- meta->set_group("metadata");
- meta->set_data(m.data(), m.size());
- meta->write(tss);
- meta->checksum();
-
- /* Write a reference to this block in the root. */
- ObjectReference ref = meta->get_ref();
- metadata_root << "@" << ref.to_string() << "\n";
- segment_list.insert(ref.get_segment());
-
- delete meta;
-
- metadata.str("");
+ segment_list.insert(segment);
}
/* Read data from a file descriptor and return the amount of data read. A
statcache->Save(path, &stat_buf, file_info["checksum"], object_list);
- /* For files that only need to be broken apart into a few objects, store
- * the list of objects directly. For larger files, store the data
- * out-of-line and provide a pointer to the indrect object. */
- if (object_list.size() < 8) {
- string blocklist = "";
- for (list<string>::iterator i = object_list.begin();
- i != object_list.end(); ++i) {
- if (i != object_list.begin())
- blocklist += " ";
- blocklist += *i;
- }
- file_info["data"] = blocklist;
- } else {
- string blocklist = "";
- for (list<string>::iterator i = object_list.begin();
- i != object_list.end(); ++i) {
- blocklist += *i + "\n";
- }
-
- LbsObject *i = new LbsObject;
- i->set_group("metadata");
- i->set_data(blocklist.data(), blocklist.size());
- i->write(tss);
- file_info["data"] = "@" + i->get_name();
- segment_list.insert(i->get_ref().get_segment());
- delete i;
+ string blocklist = "";
+ for (list<string>::iterator i = object_list.begin();
+ i != object_list.end(); ++i) {
+ if (i != object_list.begin())
+ blocklist += "\n ";
+ blocklist += *i;
}
+ file_info["data"] = blocklist;
return size;
}
printf("%s\n", path.c_str());
file_info["mode"] = encode_int(stat_buf.st_mode & 07777, 8);
+ file_info["ctime"] = encode_int(stat_buf.st_ctime);
file_info["mtime"] = encode_int(stat_buf.st_mtime);
file_info["user"] = encode_int(stat_buf.st_uid);
file_info["group"] = encode_int(stat_buf.st_gid);
if (stat_buf.st_nlink > 1 && (stat_buf.st_mode & S_IFMT) != S_IFDIR) {
file_info["links"] = encode_int(stat_buf.st_nlink);
- file_info["inode"] = encode_int(major(stat_buf.st_dev))
- + "/" + encode_int(minor(stat_buf.st_dev))
- + "/" + encode_int(stat_buf.st_ino);
}
+ file_info["inode"] = encode_int(major(stat_buf.st_dev))
+ + "/" + encode_int(minor(stat_buf.st_dev))
+ + "/" + encode_int(stat_buf.st_ino);
+
char inode_type;
switch (stat_buf.st_mode & S_IFMT) {
fprintf(stderr, "error reading symlink: %m\n");
} else if (len <= stat_buf.st_size) {
buf[len] = '\0';
- file_info["contents"] = uri_encode(buf);
+ file_info["target"] = uri_encode(buf);
} else if (len > stat_buf.st_size) {
fprintf(stderr, "error reading symlink: name truncated\n");
}
delete[] buf;
break;
case S_IFREG:
- inode_type = '-';
+ inode_type = 'f';
file_size = dumpfile(fd, file_info, path, stat_buf);
file_info["size"] = encode_int(file_size);
file_info["type"] = string(1, inode_type);
- metadata << "name: " << uri_encode(path) << "\n";
- dict_output(metadata, file_info);
- metadata << "\n";
-
- // Break apart metadata listing if it becomes too large.
- if (metadata.str().size() > LBS_METADATA_BLOCK_SIZE)
- metadata_flush();
+ metawriter->add(path, file_info);
}
void scanfile(const string& path, bool include)
statcache->Open(localdb_dir.c_str(), desc_buf,
backup_scheme.size() ? backup_scheme.c_str() : NULL);
- scanfile(".", false);
-
- metadata_flush();
- const string md = metadata_root.str();
+ metawriter = new MetadataWriter(tss, localdb_dir.c_str(), desc_buf,
+ backup_scheme.size()
+ ? backup_scheme.c_str()
+ : NULL);
- LbsObject *root = new LbsObject;
- root->set_group("metadata");
- root->set_data(md.data(), md.size());
- root->write(tss);
- root->checksum();
- segment_list.insert(root->get_ref().get_segment());
+ scanfile(".", false);
- string backup_root = root->get_ref().to_string();
- delete root;
+ ObjectReference root_ref = metawriter->close();
+ add_segment(root_ref.get_segment());
+ string backup_root = root_ref.to_string();
statcache->Close();
delete statcache;
+ delete metawriter;
+
tss->sync();
tss->dump_stats();
delete tss;
}
FILE *descriptor = fdopen(descriptor_fd, "w");
- fprintf(descriptor, "Format: LBS Snapshot v0.2\n");
+ fprintf(descriptor, "Format: LBS Snapshot v0.6\n");
fprintf(descriptor, "Producer: LBS %s\n", lbs_version);
strftime(desc_buf, sizeof(desc_buf), "%Y-%m-%d %H:%M:%S %z", &time_buf);
fprintf(descriptor, "Date: %s\n", desc_buf);
projects / cumulus.git / blobdiff