filecluster 0.4.16 → 0.4.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a77a589e905d57361c53d461dac5bbdffcf5b15
-  data.tar.gz: de91ef4e8a99f6124a24b72d0f4b63c428cd2286
+  metadata.gz: 376e00916cd7b2384892f7b11f2835780f767061
+  data.tar.gz: dd5e27d1796f88edaad7cd3a6c86db1abea85c9b
 SHA512:
-  metadata.gz: 1e5e4519345081eca7d9b6fd704d65f185fb01e95bdf5d9a381430ffc8cf44afb5f6e96165cf3cb27543b1450b8d79e320e0d11f2ab0d40df4b61ad69c92eaf9
-  data.tar.gz: 36940d94c87ddf6c69b5875df1d5d12d66c5ce02f502f1aea8c9a43f068ff0f3ad6167f53be9d6ec765175edc91b73830b880d2bff226eb5707358db3c7e2366
+  metadata.gz: d23de791e039af872b21516509c6458b93ddcdb74e485bea3f281452999e803f5848fc99367bd5767eebc1ec707ac7881d2db6dc4a72a7840956e4663b20bbb2
+  data.tar.gz: fef507239f5611148b49f2d99bbba2fa8a0935a5f6fa98a46479fa015b5270a406d397a2fbd61adb8aeb3156ffc7166a3572c851f75299f14148a803fc60ed7d

data/lib/fc/item.rb

@@ -53,7 +53,14 @@ module FC
         item_storage = item.make_item_storage(storage, 'ready')
         item.reload
       else
-        storage = policy.get_proper_storage_for_create(item.size, local_path)
+        if item.copies.to_i > 0
+          # find storage in item.item_storages 
+          storages_names = item.get_item_storages.select{|s| s.status == 'ready'}.map(&:storage_name)
+          storage = FC::Storage.select_proper_storage_for_create(policy.get_create_storages, item.size) do |storages|
+            storages.select{|s| storages_names.detect(s.name)}
+          end
+        end
+        storage = policy.get_proper_storage_for_create(item.size, local_path) unless storage
         FC::Error.raise 'No available storage', :item_id => item.id unless storage
         
         # mark delete item_storages on replace

data/lib/fc/version.rb

@@ -1,3 +1,3 @@
 module FC
-  VERSION = "0.4.16"
+  VERSION = "0.4.17"
 end

data/test/functional_test.rb

@@ -81,6 +81,11 @@ class FunctionalTest < Test::Unit::TestCase
     assert_equal errors_count+1, FC::Error.where.count, "Error not saved after replace item"
     assert_nothing_raised { @item2 = FC::Item.create_from_local(@@test_file_path, 'test2', @@policies[0], {:replace => true, :tag => 'test'}) }
     assert_equal @item.id, @item2.id, "Item (id1=#{@item.id}, id2=#{@item2.id}) change id after replace"
+    item_storage = @item2.get_item_storages.first
+    item_storage.storage_name = 'host2-sda'
+    item_storage.save
+    assert_nothing_raised { @item2 = FC::Item.create_from_local(@@test_file_path, 'test2', @@policies[0], {:replace => true, :tag => 'test'}) }
+    assert_equal 'host2-sda', @item2.get_item_storages.first.storage_name
   end
   
   should "item create_from_local available storage" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filecluster
 version: !ruby/object:Gem::Version
-  version: 0.4.16
+  version: 0.4.17
 platform: ruby
 authors:
 - sh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-28 00:00:00.000000000 Z
+date: 2015-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2