filecluster 0.5.8 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc12e92010113085a66dea7bfbac267f67768247
-  data.tar.gz: 80afdcb6ec68e4b282e359bd75cc46975787a22b
+  metadata.gz: 3f60e5ac0d24dbb13cd23102a51c0c044fb3cd01
+  data.tar.gz: 36808f3fbf80cb1af4149259d85dc409d3bf093a
 SHA512:
-  metadata.gz: b67df5a734df911038c68f9b2780f355357adfec7865af7cacb55c661c09cb719dbec6f7d038d2cccb79dd9dee423391898efdcf9b98236cb6d2b0c01e46fd4e
-  data.tar.gz: 1d7eb36494a02a57c786da0a53c65bc60e280d13abd438e391384607a1f25951dc79584579d739d7d96a2c2a863ece8fa8d6dc7bc7dc639a7c5ac51cda9bbf37
+  metadata.gz: 39e08fe5acf73bd152b30d68b74536dbabb57c30722ce7606a597d383680ff1b3db1432cec8467c9fce6d8e15a501035d0c61fe7a45a09deffb73b8e46509b52
+  data.tar.gz: 0499dfd3ab6bfa66cfc9589d937235d61d8578160184194d6e8afc2b98f3e3cc6737c3cc762d82bc3e8f2c5934c0bc95f0578cecd86a66fed5b779a5fc261b97

data/lib/fc/item.rb

@@ -78,8 +78,7 @@ module FC
         FC::DB.query("UPDATE #{FC::ItemStorage.table_name} SET status='delete' WHERE item_id = #{item.id} AND storage_name <> '#{storage.name}'") if options[:replace]          
         
         item_storage = item.make_item_storage(storage)
-        speed_limit = options[:speed_limit].present? ? options[:speed_limit] : nil
-        item.copy_item_storage(local_path, storage, item_storage, options[:remove_local], speed_limit)
+        item.copy_item_storage(local_path, storage, item_storage, options[:remove_local], options[:speed_limit])
       end
       
       return item

data/lib/fc/version.rb

@@ -1,3 +1,3 @@
 module FC
-  VERSION = '0.5.8'.freeze
+  VERSION = '0.5.9'.freeze
 end

data/test/daemon_test.rb

@@ -23,7 +23,7 @@ class DaemonTest < Test::Unit::TestCase
       FC::Var.set('daemon_global_error_items_ttl', 2)
       @stotage_checks = 0
       Thread.new do
-        Open3.popen2e("#{daemon_bin} -c #{db_config_file} -l debug -h host1") do |stdin, stdout, t|
+        Open3.popen2e("#{daemon_bin} -c #{db_config_file} -l debug -h localhost") do |stdin, stdout, t|
           @@pid = t.pid
           while line = stdout.readline
             @stotage_checks += 1 if line =~ /Finish stotage check/i
@@ -47,21 +47,21 @@ class DaemonTest < Test::Unit::TestCase
       @@storages = []
       @@storages << FC::Storage.new(
         :name => 'host1-sda',
-        :host => 'host1',
+        :host => 'localhost',
         :path => '/tmp/host1-sda/',
         :copy_storages => 'host1-sdb,host1-sdc', 
         :size_limit => 1_000_000_000
       )
       @@storages << FC::Storage.new(
         :name => 'host1-sdb',
-        :host => 'host1',
+        :host => 'localhost',
         :path => '/tmp/host1-sdb/',
         :copy_storages => 'host1-sda,host1-sdc', 
         :size_limit => 1_000_000_000
       )
       @@storages << FC::Storage.new(
         :name => 'host1-sdc',
-        :host => 'host1',
+        :host => 'localhost',
         :path => '/tmp/host1-sdc/',
         :copy_storages => 'host1-sda,host1-sdb',
         :size_limit => 1_000_000_000
@@ -104,8 +104,6 @@ class DaemonTest < Test::Unit::TestCase
     assert @@storages[1].up?, "Storage #{@@storages[1].name} down"
     assert @@storages[2].up?, "Storage #{@@storages[2].name} down"
     
-    FC::Storage.any_instance.stubs(:host).returns('host1')
-    FC::Storage.stubs(:curr_host).returns('host1')
     assert_nothing_raised { @item1 = make_file_item('bla/bla/test1', 'test1') }
     assert_nothing_raised { @item2 = make_file_item('bla/bla/test2', 'test2') }
     assert_nothing_raised { @item3 = make_dir_item('bla/bla/test3', 'test3') }

data/test/storage_sync_test.rb

@@ -12,7 +12,7 @@ class StorageSyncTest < Test::Unit::TestCase
       @@test_file_path = '/tmp/fc_test_file'
       `dd if=/dev/urandom of=#{@@test_file_path} bs=1M count=1 2>&1`
       
-      @@storage = FC::Storage.new(:name => 'host1-sda', :host => 'host1', :path => '/tmp/host1-sda/', :size_limit => 1000000000, :check_time => Time.new.to_i)
+      @@storage = FC::Storage.new(:name => 'host1-sda', :host => 'localhost', :path => '/tmp/host1-sda/', :size_limit => 1000000000, :check_time => Time.new.to_i)
       @@storage.save
       @@policy = FC::Policy.new(:create_storages => 'host1-sda', :copies => 1, :name => 'policy 1')
       @@policy.save
@@ -28,11 +28,6 @@ class StorageSyncTest < Test::Unit::TestCase
     end
   end
   
-  def setup
-    FC::Storage.any_instance.stubs(:host).returns('host1')
-    FC::Storage.stubs(:curr_host).returns('host1')
-  end
-  
   should "sync_all" do
     assert_nothing_raised { @item1 = FC::Item.create_from_local(@@test_file_path, 'a/test1', @@policy, {:tag => 'test'}) }
     assert_nothing_raised { @item2 = FC::Item.create_from_local(@@test_file_path, 'a/b/test2', @@policy, {:tag => 'test'}) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: filecluster
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.9
 platform: ruby
 authors:
 - sh