NEWS updates.

[cumulus.git] / store.cc

diff --git a/store.cc b/store.cc
index 9d4d1bd..f4f1dbb 100644 (file)
--- a/store.cc
+++ b/store.cc
@@ -46,17 +46,15 @@ static void cloexec(int fd)
     fcntl(fd, F_SETFD, flags | FD_CLOEXEC);
 }
 
-Tarfile::Tarfile(const string &path, const string &segment)
+Tarfile::Tarfile(RemoteFile *file, const string &segment)
     : size(0),
       segment_name(segment)
 {
     assert(sizeof(struct tar_header) == TAR_BLOCK_SIZE);
 
-    real_fd = open(path.c_str(), O_WRONLY | O_CREAT, 0666);
-    if (real_fd < 0)
-        throw IOException("Error opening output file");
-
-    filter_fd = spawn_filter(real_fd);
+    this->file = file;
+    real_fd = file->get_fd();
+    filter_fd = spawn_filter(real_fd, filter_program, &filter_pid);
 }
 
 Tarfile::~Tarfile()
@@ -86,9 +84,10 @@ Tarfile::~Tarfile()
  * on the TAR output.  The file descriptor to which output should be written
  * must be specified; the return value is the file descriptor which will be
  * attached to the standard input of the filter program. */
-int Tarfile::spawn_filter(int fd_out)
+int spawn_filter(int fd_out, const char *program, pid_t *filter_pid)
 {
     int fds[2];
+    pid_t pid;
 
     /* Create a pipe for communicating with the filter process. */
     if (pipe(fds) < 0) {
@@ -96,14 +95,16 @@ int Tarfile::spawn_filter(int fd_out)
     }
 
     /* Create a child process which can exec() the filter program. */
-    filter_pid = fork();
-    if (filter_pid < 0)
+    pid = fork();
+    if (pid < 0)
         throw IOException("Unable to fork filter process");
 
-    if (filter_pid > 0) {
+    if (pid > 0) {
         /* Parent process */
         close(fds[0]);
         cloexec(fds[1]);
+        if (filter_pid != NULL)
+            *filter_pid = pid;
     } else {
         /* Child process.  Rearrange file descriptors.  stdin is fds[0], stdout
          * is fd_out, stderr is unchanged. */
@@ -118,7 +119,7 @@ int Tarfile::spawn_filter(int fd_out)
         close(fd_out);
 
         /* Exec the filter program. */
-        execlp("/bin/sh", "/bin/sh", "-c", filter_program, NULL);
+        execlp("/bin/sh", "/bin/sh", "-c", program, NULL);
 
         /* Should not reach here except for error cases. */
         fprintf(stderr, "Could not exec filter: %m\n");
@@ -149,19 +150,13 @@ void Tarfile::tar_write(const char *data, size_t len)
 
 void Tarfile::write_object(int id, const char *data, size_t len)
 {
+    struct tar_header header;
+    memset(&header, 0, sizeof(header));
+
     char buf[64];
     sprintf(buf, "%08x", id);
     string path = segment_name + "/" + buf;
 
-    internal_write_object(path, data, len);
-}
-
-void Tarfile::internal_write_object(const string &path,
-                                    const char *data, size_t len)
-{
-    struct tar_header header;
-    memset(&header, 0, sizeof(header));
-
     assert(path.size() < 100);
     memcpy(header.name, path.data(), path.size());
     sprintf(header.mode, "%07o", 0600);
@@ -230,12 +225,12 @@ ObjectReference TarSegmentStore::write_object(const char *data, size_t len,
         segment = new segment_info;
 
         segment->name = generate_uuid();
-
-        string filename = path + "/" + segment->name + ".tar";
-        filename += filter_extension;
-        segment->file = new Tarfile(filename, segment->name);
-
+        segment->basename = segment->name + ".tar";
+        segment->basename += filter_extension;
         segment->count = 0;
+        segment->size = 0;
+        segment->rf = remote->alloc_file(segment->basename, "segments");
+        segment->file = new Tarfile(segment->rf, segment->name);
 
         segments[group] = segment;
     } else {
@@ -248,6 +243,7 @@ ObjectReference TarSegmentStore::write_object(const char *data, size_t len,
 
     segment->file->write_object(id, data, len);
     segment->count++;
+    segment->size += len;
 
     group_sizes[group] += len;
 
@@ -281,6 +277,18 @@ void TarSegmentStore::close_segment(const string &group)
     struct segment_info *segment = segments[group];
 
     delete segment->file;
+
+    if (db != NULL) {
+        SHA1Checksum segment_checksum;
+        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);
+        }
+    }
+
+    segment->rf->send();
+
     segments.erase(segments.find(group));
     delete segment;
 }