keep appended node name when compressing riak dump file

backup · Feb 25, 2013 · 752b4f4 · 752b4f4
1 parent a55c1ac
commit 752b4f4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/lib/backup/database/riak.rb b/lib/backup/database/riak.rb
@@ -45,8 +45,11 @@ def initialize(model, &block)
       end
 
       ##
-      # Performs the riak-admin command and outputs the
-      # data to the specified path based on the 'trigger'
+      # Performs the `riak-admin` command which creates a single dump file in
+      # @dump_path based on the `name` and `node`.
+      #
+      # `riak-admin` will append the `node` to the filename.
+      # i.e. <tmp_path>/<trigger>/databases/Riak/<name>-<node>
       def perform!
         super
         # ensure riak-admin user has permissions to write backup file
@@ -57,8 +60,9 @@ def perform!
 
         if @model.compressor
           @model.compressor.compress_with do |command, ext|
-            run("#{ command } -c #{ backup_file }-#{ node } > #{ backup_file + ext }")
-            FileUtils.rm_f("#{ backup_file }-#{ node }")
+            backup_file << "-#{ node }"
+            run("#{ command } -c #{ backup_file } > #{ backup_file + ext }")
+            FileUtils.rm_f(backup_file)
           end
         end
       end

diff --git a/spec/database/riak_spec.rb b/spec/database/riak_spec.rb
@@ -135,8 +135,8 @@
         db.expects(:run).in_sequence(s).
             with('riakadmin_command /dump/path/mydatabase node')
         db.expects(:run).in_sequence(s).with(
-          "compressor_command -c " +
-          "/dump/path/mydatabase-riak@localhost > /dump/path/mydatabase.gz"
+          "compressor_command -c /dump/path/mydatabase-riak@localhost > " +
+          "/dump/path/mydatabase-riak@localhost.gz"
         )
         FileUtils.expects(:rm_f).in_sequence(s).
             with('/dump/path/mydatabase-riak@localhost')