From f1f817df56ce99ea544569635698df55d72bd1ee Mon Sep 17 00:00:00 2001 From: Michael Vrable Date: Wed, 9 Apr 2008 14:04:44 -0700 Subject: [PATCH] Update arguments passed to upload script. Fix the remote upload script implementation in lbs so that it matches the conventions expected by the S3 sample script. --- remote.cc | 11 +++++++---- remote.h | 7 ++++--- scandir.cc | 6 ++++-- store.cc | 2 +- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/remote.cc b/remote.cc index a279751..6d80b02 100644 --- a/remote.cc +++ b/remote.cc @@ -67,13 +67,13 @@ RemoteStore::~RemoteStore() * will initially be created in a temporary directory. When the file is * written out, the RemoteFile object should be passed to RemoteStore::enqueue, * which will upload it to the remote server. */ -RemoteFile *RemoteStore::alloc_file(const string &name) +RemoteFile *RemoteStore::alloc_file(const string &name, const string &type) { fprintf(stderr, "Allocate file: %s\n", name.c_str()); pthread_mutex_lock(&lock); files_outstanding++; pthread_mutex_unlock(&lock); - return new RemoteFile(this, name, staging_dir + "/" + name); + return new RemoteFile(this, name, type, staging_dir + "/" + name); } /* Request that a file be transferred to the remote server. The actual @@ -153,7 +153,8 @@ void RemoteStore::transfer_thread() } if (pid == 0) { string cmd = backup_script; - cmd += " " + file->local_path + " " + file->remote_path; + cmd += " " + file->local_path + " " + file->type + " " + + file->remote_path; execlp("/bin/sh", "/bin/sh", "-c", cmd.c_str(), NULL); throw IOException("exec failed"); } @@ -177,9 +178,11 @@ void RemoteStore::transfer_thread() } RemoteFile::RemoteFile(RemoteStore *remote, - const string &name, const string &local_path) + const string &name, const string &type, + const string &local_path) { remote_store = remote; + this->type = type; this->local_path = local_path; this->remote_path = name; diff --git a/remote.h b/remote.h index 85de06c..7c084c7 100644 --- a/remote.h +++ b/remote.h @@ -26,7 +26,7 @@ public: ~RemoteStore(); void set_script(const std::string &script) { backup_script = script; } - RemoteFile *alloc_file(const std::string &name); + RemoteFile *alloc_file(const std::string &name, const std::string &type); void enqueue(RemoteFile *file); void sync(); @@ -65,12 +65,13 @@ private: friend class RemoteStore; RemoteFile(RemoteStore *remote, - const std::string &name, const std::string &local_path); + const std::string &name, const std::string &type, + const std::string &local_path); RemoteStore *remote_store; int fd; - std::string local_path; + std::string type, local_path; std::string remote_path; }; diff --git a/scandir.cc b/scandir.cc index 1daf352..eb05243 100644 --- a/scandir.cc +++ b/scandir.cc @@ -782,7 +782,8 @@ int main(int argc, char *argv[]) if (backup_scheme.size() > 0) checksum_filename += backup_scheme + "-"; checksum_filename = checksum_filename + desc_buf + "." + csum_type + "sums"; - RemoteFile *checksum_file = remote->alloc_file(checksum_filename); + RemoteFile *checksum_file = remote->alloc_file(checksum_filename, + "checksums"); FILE *checksums = fdopen(checksum_file->get_fd(), "w"); for (std::set::iterator i = segment_list.begin(); @@ -824,7 +825,8 @@ int main(int argc, char *argv[]) desc_filename += backup_scheme + "-"; desc_filename = desc_filename + desc_buf + ".lbs"; - RemoteFile *descriptor_file = remote->alloc_file(desc_filename); + RemoteFile *descriptor_file = remote->alloc_file(desc_filename, + "snapshots"); int descriptor_fd = descriptor_file->get_fd(); if (descriptor_fd < 0) { fprintf(stderr, "Unable to open descriptor output file: %m\n"); diff --git a/store.cc b/store.cc index 3dcfcb4..f4f1dbb 100644 --- a/store.cc +++ b/store.cc @@ -229,7 +229,7 @@ ObjectReference TarSegmentStore::write_object(const char *data, size_t len, segment->basename += filter_extension; segment->count = 0; segment->size = 0; - segment->rf = remote->alloc_file(segment->basename); + segment->rf = remote->alloc_file(segment->basename, "segments"); segment->file = new Tarfile(segment->rf, segment->name); segments[group] = segment; -- 2.20.1