projects
/
cumulus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Write out a generic segment metadata file with backups.
[cumulus.git]
/
store.cc
diff --git
a/store.cc
b/store.cc
index
f87b671
..
ccd055d
100644
(file)
--- a/
store.cc
+++ b/
store.cc
@@
-1,7
+1,6
@@
-/* Cumulus: Smart Filesystem Backup to Dumb Servers
- *
- * Copyright (C) 2008 The Regents of the University of California
- * Written by Michael Vrable <mvrable@cs.ucsd.edu>
+/* Cumulus: Efficient Filesystem Backup to the Cloud
+ * Copyright (C) 2008-2009 The Cumulus Developers
+ * See the AUTHORS file for a list of contributors.
*
* 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
*
* 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
@@
-42,6
+41,7
@@
#include <iostream>
#include "hash.h"
#include <iostream>
#include "hash.h"
+#include "localdb.h"
#include "store.h"
#include "ref.h"
#include "util.h"
#include "store.h"
#include "ref.h"
#include "util.h"
@@
-227,7
+227,9
@@
static const size_t SEGMENT_SIZE = 4 * 1024 * 1024;
static map<string, pair<int64_t, int64_t> > group_sizes;
ObjectReference TarSegmentStore::write_object(const char *data, size_t len,
static map<string, pair<int64_t, int64_t> > group_sizes;
ObjectReference TarSegmentStore::write_object(const char *data, size_t len,
- const std::string &group)
+ const std::string &group,
+ const std::string &checksum,
+ double age)
{
struct segment_info *segment;
{
struct segment_info *segment;
@@
-241,8
+243,10
@@
ObjectReference TarSegmentStore::write_object(const char *data, size_t len,
segment->basename = segment->name + ".tar";
segment->basename += filter_extension;
segment->count = 0;
segment->basename = segment->name + ".tar";
segment->basename += filter_extension;
segment->count = 0;
- segment->size = 0;
- segment->rf = remote->alloc_file(segment->basename, "segments");
+ segment->data_size = 0;
+ segment->rf = remote->alloc_file(segment->basename,
+ group == "metadata" ? "segments0"
+ : "segments1");
segment->file = new Tarfile(segment->rf, segment->name);
segments[group] = segment;
segment->file = new Tarfile(segment->rf, segment->name);
segments[group] = segment;
@@
-256,11
+260,16
@@
ObjectReference TarSegmentStore::write_object(const char *data, size_t len,
segment->file->write_object(id, data, len);
segment->count++;
segment->file->write_object(id, data, len);
segment->count++;
- segment->size += len;
+ segment->
data_
size += len;
group_sizes[group].first += len;
ObjectReference ref(segment->name, id_buf);
group_sizes[group].first += len;
ObjectReference ref(segment->name, id_buf);
+ ref.set_range(0, len, true);
+ if (checksum.size() > 0)
+ ref.set_checksum(checksum);
+ if (db != NULL)
+ db->StoreObject(ref, age);
// If this segment meets or exceeds the size target, close it so that
// future objects will go into a new segment.
// If this segment meets or exceeds the size target, close it so that
// future objects will go into a new segment.
@@
-293,17
+302,21
@@
void TarSegmentStore::close_segment(const string &group)
delete segment->file;
if (db != NULL) {
delete segment->file;
if (db != NULL) {
+ struct stat stat_buf;
+ int disk_size = 0;
+ if (stat(segment->rf->get_local_path().c_str(), &stat_buf) == 0) {
+ disk_size = stat_buf.st_size;
+ group_sizes[segment->group].second += disk_size;
+ }
+
SHA1Checksum segment_checksum;
SHA1Checksum segment_checksum;
+ string checksum;
if (segment_checksum.process_file(segment->rf->get_local_path().c_str())) {
if (segment_checksum.process_file(segment->rf->get_local_path().c_str())) {
- string checksum = segment_checksum.checksum_str();
- db->SetSegmentChecksum(segment->name, segment->basename, checksum,
- segment->size);
+ checksum = segment_checksum.checksum_str();
}
}
- struct stat stat_buf;
- if (stat(segment->rf->get_local_path().c_str(), &stat_buf) == 0) {
- group_sizes[segment->group].second += stat_buf.st_size;
- }
+ db->SetSegmentMetadata(segment->name, segment->rf->get_remote_path(),
+ checksum, group, segment->data_size, disk_size);
}
segment->rf->send();
}
segment->rf->send();
@@
-318,7
+331,7
@@
string TarSegmentStore::object_reference_to_segment(const string &object)
}
LbsObject::LbsObject()
}
LbsObject::LbsObject()
- : group(""), data(NULL), data_len(0), written(false)
+ : group(""),
age(0.0),
data(NULL), data_len(0), written(false)
{
}
{
}
@@
-326,21
+339,26
@@
LbsObject::~LbsObject()
{
}
{
}
-void LbsObject::
write(TarSegmentStore *store
)
+void LbsObject::
set_data(const char *d, size_t len, const char *checksum
)
{
{
-
assert(data != NULL)
;
-
assert(!written)
;
+
data = d
;
+
data_len = len
;
- ref = store->write_object(data, data_len, group);
- written = true;
+ if (checksum != NULL) {
+ this->checksum = checksum;
+ } else {
+ Hash *hash = Hash::New();
+ hash->update(data, data_len);
+ this->checksum = hash->digest_str();
+ delete hash;
+ }
}
}
-void LbsObject::
checksum(
)
+void LbsObject::
write(TarSegmentStore *store
)
{
{
- assert(written);
+ assert(data != NULL);
+ assert(!written);
- Hash *hash = Hash::New();
- hash->update(data, data_len);
- ref.set_checksum(hash->digest_str());
- delete hash;
+ ref = store->write_object(data, data_len, group, checksum, age);
+ written = true;
}
}