filecluster 0.5.13 → 0.5.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55c62eefa42ab98952d048ba96e7467a4a88fd80
-  data.tar.gz: 6f9464f3d84c270a9ed46f84790dc605be33f72d
+  metadata.gz: df71ee0cd0c4068b96655ad85da5a84de2aa2044
+  data.tar.gz: f7787796c064db4b2e7f373d94422cb0af708eca
 SHA512:
-  metadata.gz: ff5af3f5f2c994df7bf18c191e7d4ad38c6c2f7bf79e43ac2f3ff2011ef49717d26b174d83a01d115f932c396f59a392e0dd98ca2a870d1b10ff873c2220a8a2
-  data.tar.gz: a4934117b805502c5f5b7ca0cf6d496455326f90c57e1587bf03a7bd913bea45b72a172e4f078182d97a7e16158c00d62f65d12b98831b539cfa5d4e08c29dee
+  metadata.gz: 053ef243b2f1c07f955207af615764909245cdcf5d7b35d76c34f267e3f80a9572f1465208cd2d2bfd34e2095103988609cbba66fb3f8c9d1ad29b27443b5f96
+  data.tar.gz: 52e8e8ee2cf22ede6b1f31448d3b7233ea3a883938c8a4ec4d27922b08dc124a76b2f74668e146c4cc6d51e45060dd0b563071375e5afc6fc32b0077374855da

data/Rakefile

@@ -5,6 +5,7 @@ require 'rake/testtask'
 Rake::TestTask.new do |t|
   t.libs << 'test'
   t.test_files = FileList["test/*_test.rb"]
+  t.warning = false
 end
 
 desc "Run tests"

data/lib/fc/item.rb

@@ -108,8 +108,7 @@ module FC
         end
         md5_on_storage = storage.md5_sum(name) if md5
       rescue Exception => e
-        item_storage.status = 'error'
-        item_storage.save
+        item_storage_status_set(item_storage, 'error')
         FC::Error.raise "Copy error: #{e.message}", :item_id => id, :item_storage_id => item_storage.id
       else
         begin
@@ -118,13 +117,10 @@ module FC
           FC::Error.raise "After copy error: #{e.message}", :item_id => id, :item_storage_id => item_storage.id
         else
           if md5 && md5_on_storage != md5
-            item_storage.status = 'error'
-            item_storage.save
+            item_storage_status_set(item_storage, 'error')
             FC::Error.raise "Check md5 after copy error", :item_id => id, :item_storage_id => item_storage.id
           else
-            item_storage.status = 'ready'
-            item_storage.save
-            reload
+            item_storage_status_set(item_storage, 'ready')
             if remove_local && !src.instance_of?(FC::Storage) && File.exists?(src)
               if File.directory?(src)
                 FileUtils.rm_r(src)
@@ -136,7 +132,16 @@ module FC
         end
       end
     end
-    
+
+    def item_storage_status_set(item_storage, status)
+      reload
+      marked_for_delete = self.status == 'deferred_delete'
+      item_storage.status = status
+      item_storage.save
+      reload
+      mark_deleted if marked_for_delete
+    end
+
     # mark item and his items_storages for deferred delete
     # real delete after policy.delete_deferred_time
     def mark_deleted

data/lib/fc/version.rb

@@ -1,3 +1,3 @@
 module FC
-  VERSION = '0.5.13'.freeze
+  VERSION = '0.5.14'.freeze
 end

data/test/db_test.rb

@@ -145,8 +145,10 @@ class DbTest < Test::Unit::TestCase
     assert_equal 'rec1-sda,rec2-sdd', @policies[1].create_storages, "Policy (id=#{@policies[0].id}) incorrect create_storages"
     assert_equal 'rec1-sda', @policies[2].create_storages, "Policy (id=#{@policies[0].id}) incorrect create_storages"
     
-    assert_raise(Mysql2::Error, 'Create policy with uniq name') { FC::Policy.new(:create_storages => 'bla,test', :name => 'policy 1').save }
-    assert_raise(Mysql2::Error, 'Create policy with incorrect create_storages') { FC::Policy.new(:create_storages => 'bla,test', :name => 'new policy').save }
+    FC::Policy.new(:create_storages => 'rec2-sda,rec2-sdd', :name => 'policy 1').save
+    assert_equal 'rec1-sda,rec1-sdd', FC::Policy.where('name = ?', 'policy 1').first.create_storages, "Create policy with uniq name"
+    FC::Policy.new(:create_storages => 'bla,test', :name => 'new policy').save
+    assert_nil FC::Policy.where('name = ?', 'new policy').first, "Create policy with incorrect create_storages"
     
     assert_raise(Mysql2::Error, 'Change storage name with linked polices') { @storages[0].name = 'blabla'; @storages[0].save }
     assert_raise(Mysql2::Error, 'Delete storage name with linked polices') { @storages[0].delete }

data/test/functional_test.rb

@@ -45,7 +45,14 @@ class FunctionalTest < Test::Unit::TestCase
     FC::Storage.any_instance.stubs(:host).returns('localhost')
     FC::Storage.stubs(:curr_host).returns('localhost')
   end
-  
+
+  def stub_method(obj, method, method_impl)
+    obj.singleton_class.send(:alias_method, "#{method}_mock_backup", method)
+    obj.define_singleton_method(method, method_impl)
+    yield if block_given?
+    obj.singleton_class.send(:alias_method, method, "#{method}_mock_backup")
+  end
+
   should "item create_from_local successful" do
     assert_nothing_raised { @item = FC::Item.create_from_local(@@test_file_path, '/bla/bla/test1', @@policies[0], {:tag => 'test'}) }
     assert_kind_of FC::Item, @item
@@ -130,7 +137,61 @@ class FunctionalTest < Test::Unit::TestCase
     # no md5 check on copy - success
     assert_nothing_raised { @item.copy_item_storage(@@storages[0], @@storages[1], item_storage) }
   end
-  
+
+  should 'item keep deferred_delete after copy' do
+    @item = FC::Item.create_from_local(@@test_file_path, 'test9', @@policies[0], {:tag => 'test', :no_md5 => true})
+    item_storage = @item.make_item_storage(@@storages[1], 'copy')
+    @item.mark_deleted
+    # rewrite item file
+    `dd if=/dev/urandom of=#{@@storages[0].path}#{@item.name} bs=100K count=1 2>&1`
+    @item.copy_item_storage(@@storages[0], @@storages[1], item_storage)
+    @item.reload
+    assert_equal 2, @item.get_item_storages.size
+    @item.get_item_storages.each do |is|
+      assert_equal 'ready', is.status
+    end
+    assert_equal 'deferred_delete', @item.status
+  end
+
+  should 'item keep deferred_delete status if changed during copy' do
+    @item = FC::Item.create_from_local(@@test_file_path, 'test10', @@policies[0], {:tag => 'test', :no_md5 => true})
+    item_storage = @item.make_item_storage(@@storages[1], 'copy')
+    # rewrite item file
+    `dd if=/dev/urandom of=#{@@storages[0].path}#{@item.name} bs=100K count=1 2>&1`
+    # no md5 check on copy - success
+    item = @item
+    stubbed_method_impl = proc { |*args|
+      copy_to_local_mock_backup(*args)
+      item.mark_deleted
+    }
+    stub_method(@@storages[0], :copy_to_local, stubbed_method_impl) do
+      @item.copy_item_storage(@@storages[0], @@storages[1], item_storage)
+    end
+    @item.reload
+    assert_equal 'ready', item_storage.status
+    assert_equal 'deferred_delete', @item.status
+  end
+
+  should 'item keep deferred_delete status if changed during copy and error was raised' do
+    @item = FC::Item.create_from_local(@@test_file_path, 'test11', @@policies[0], {:tag => 'test'})
+    item_storage = @item.make_item_storage(@@storages[1], 'copy')
+    # rewrite item file
+    `dd if=/dev/urandom of=#{@@storages[0].path}#{@item.name} bs=100K count=1 2>&1`
+
+    # simulate mark_delete during copy process and raise exception
+    item = @item
+    stubbed_method_impl = proc { |*_|
+      item.mark_deleted
+      raise 'oops'
+    }
+    stub_method(@@storages[0], :copy_to_local, stubbed_method_impl) do
+      assert_raise(RuntimeError) { @item.copy_item_storage(@@storages[0], @@storages[1], item_storage) }
+    end
+    @item.reload
+    assert_equal 'error', item_storage.status
+    assert_equal 'deferred_delete', @item.status
+  end
+
   should "item create_from_local inplace" do
     tmp_file_path = "/tmp/host2-sda/inplace test"
     `cp #{@@test_file_path.shellescape} #{tmp_file_path.shellescape}`

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filecluster
 version: !ruby/object:Gem::Version
-  version: 0.5.13
+  version: 0.5.14
 platform: ruby
 authors:
 - sh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-12 00:00:00.000000000 Z
+date: 2017-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2