X-Git-Url: http://git.vrable.net/?p=cumulus.git;a=blobdiff_plain;f=store.cc;h=9d4c8833b7679b1ea6483ee38fe67416f36f146b;hp=f4f1dbb42ab98cf673bb9cef5ed82381b6894403;hb=f38dd9bcb0caffd3fc9126b05788c936690e8288;hpb=f1f817df56ce99ea544569635698df55d72bd1ee diff --git a/store.cc b/store.cc index f4f1dbb..9d4c883 100644 --- a/store.cc +++ b/store.cc @@ -1,13 +1,31 @@ -/* LBS: An LFS-inspired filesystem backup system - * Copyright (C) 2007 Michael Vrable +/* Cumulus: Smart Filesystem Backup to Dumb Servers * - * Backup data is stored in a collection of objects, which are grouped together + * Copyright (C) 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. + */ + +/* Backup data is stored in a collection of objects, which are grouped together * into segments for storage purposes. This implementation of the object store * represents segments as TAR files and objects as files within them. */ #include #include #include +#include #include #include #include @@ -25,10 +43,12 @@ #include "store.h" #include "ref.h" +#include "util.h" using std::max; using std::list; using std::map; +using std::pair; using std::set; using std::string; @@ -36,16 +56,6 @@ using std::string; const char *filter_program = "bzip2 -c"; const char *filter_extension = ".bz2"; -static void cloexec(int fd) -{ - long flags = fcntl(fd, F_GETFD); - - if (flags < 0) - return; - - fcntl(fd, F_SETFD, flags | FD_CLOEXEC); -} - Tarfile::Tarfile(RemoteFile *file, const string &segment) : size(0), segment_name(segment) @@ -67,14 +77,14 @@ Tarfile::~Tarfile() tar_write(buf, TAR_BLOCK_SIZE); if (close(filter_fd) != 0) - throw IOException("Error closing Tarfile"); + fatal("Error closing Tarfile"); /* ...and wait for filter process to finish. */ int status; waitpid(filter_pid, &status, 0); if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) { - throw IOException("Filter process error"); + fatal("Filter process error"); } close(real_fd); @@ -91,13 +101,13 @@ int spawn_filter(int fd_out, const char *program, pid_t *filter_pid) /* Create a pipe for communicating with the filter process. */ if (pipe(fds) < 0) { - throw IOException("Unable to create pipe for filter"); + fatal("Unable to create pipe for filter"); } /* Create a child process which can exec() the filter program. */ pid = fork(); if (pid < 0) - throw IOException("Unable to fork filter process"); + fatal("Unable to fork filter process"); if (pid > 0) { /* Parent process */ @@ -140,7 +150,7 @@ void Tarfile::tar_write(const char *data, size_t len) if (errno == EINTR) continue; fprintf(stderr, "Write error: %m\n"); - throw IOException("Write error"); + fatal("Write error"); } len -= res; @@ -162,7 +172,7 @@ void Tarfile::write_object(int id, const char *data, size_t len) sprintf(header.mode, "%07o", 0600); sprintf(header.uid, "%07o", 0); sprintf(header.gid, "%07o", 0); - sprintf(header.size, "%011o", len); + sprintf(header.size, "%011o", (int)len); sprintf(header.mtime, "%011o", (int)time(NULL)); header.typeflag = '0'; strcpy(header.magic, "ustar "); @@ -212,7 +222,8 @@ size_t Tarfile::size_estimate() static const size_t SEGMENT_SIZE = 4 * 1024 * 1024; -static map group_sizes; +/* Backup size summary: segment type -> (uncompressed size, compressed size) */ +static map > group_sizes; ObjectReference TarSegmentStore::write_object(const char *data, size_t len, const std::string &group) @@ -225,6 +236,7 @@ ObjectReference TarSegmentStore::write_object(const char *data, size_t len, segment = new segment_info; segment->name = generate_uuid(); + segment->group = group; segment->basename = segment->name + ".tar"; segment->basename += filter_extension; segment->count = 0; @@ -245,7 +257,7 @@ ObjectReference TarSegmentStore::write_object(const char *data, size_t len, segment->count++; segment->size += len; - group_sizes[group] += len; + group_sizes[group].first += len; ObjectReference ref(segment->name, id_buf); @@ -266,9 +278,10 @@ void TarSegmentStore::sync() void TarSegmentStore::dump_stats() { printf("Data written:\n"); - for (map::iterator i = group_sizes.begin(); + for (map >::iterator i = group_sizes.begin(); i != group_sizes.end(); ++i) { - printf(" %s: %lld\n", i->first.c_str(), i->second); + printf(" %s: %lld (%lld compressed)\n", i->first.c_str(), + (long long)i->second.first, (long long)i->second.second); } } @@ -285,6 +298,11 @@ void TarSegmentStore::close_segment(const string &group) db->SetSegmentChecksum(segment->name, segment->basename, checksum, segment->size); } + + 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; + } } segment->rf->send();