filecluster 0.0.9 → 0.1.0

data/lib/daemon.rb

@@ -39,7 +39,8 @@ end
 
 def update_storages
   $log.debug('Update storages')
-  $storages = FC::Storage.where('host = ?', FC::Storage.curr_host)
+  $all_storages = FC::Storage.where
+  $storages = $all_storages.select{|s| s.host == FC::Storage.curr_host}
 end
 
 def storages_check

data/lib/daemon/task_thread.rb

@@ -29,7 +29,7 @@ class TaskThread < BaseThread
     storage = $storages.detect{|s| s.name == item_storage.storage_name}
     item = FC::Item.find(item_storage.item_id)
     src_item_storage = FC::ItemStorage.where("item_id = ? AND status = 'ready'", item.id).sample
-    src_storage = $storages.detect{|s| s.name == src_item_storage.storage_name}
+    src_storage = $all_storages.detect{|s| s.name == src_item_storage.storage_name}
     item.copy_item_storage(src_storage, storage, item_storage)
   rescue Exception => e
     error "Copy item_storage error: #{e.message}; #{e.backtrace.join(', ')}", :item_id => item_storage.item_id, :item_storage_id => item_storage.id

data/lib/fc/db.rb

@@ -21,10 +21,7 @@ module FC
     end
     
     def self.connect=(connect, options = {})
-      @options = connect.query_options.merge(options)
-      @prefix = @options[:prefix].to_s
-      @connects = {}
-      @connects[Thread.current.object_id] = connect
+      self.connect_by_config connect.query_options.merge(options).merge(:as => :hash)
     end
     
     def self.close
@@ -52,7 +49,7 @@ module FC
           time int DEFAULT NULL,
           copies int NOT NULL DEFAULT 0,
           PRIMARY KEY (id), UNIQUE KEY (name(255), policy_id), 
-          KEY (outer_id), KEY (time, status), KEY (status),  KEY (copies, status, policy_id)
+          KEY (outer_id), KEY (time, status), KEY (status, policy_id, copies), KEY (copies, status, policy_id)
         ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci
       })
       proc_time = %{

data/lib/fc/item.rb

@@ -23,16 +23,18 @@ module FC
       raise 'Zero size path' if item_params[:size] == 0
       
       if local_path.include?(item_name)
-        storage = policy.get_create_storages.detect{|s| local_path.index(s.path) == 0 && local_path.sub(s.path, '') == item_params[:name]}
+        storage = policy.get_create_storages.detect do |s| 
+          s.host == FC::Storage.curr_host && local_path.index(s.path) == 0 && local_path.sub(s.path, '') == item_params[:name]
+        end
         FC::Error.raise "local_path #{local_path} is not valid path for policy ##{policy.id}" unless storage
       end
       
       # new item?
       item = FC::Item.where('name=? AND policy_id=?', item_params[:name], policy.id).first
       if item
-        if options[:replace]
+        if options[:replace] || storage
           # mark delete item_storages on replace
-          FC::DB.connect.query("UPDATE #{FC::ItemStorage.table_name} SET status='delete' WHERE item_id = #{item.id}")
+          FC::DB.connect.query("UPDATE #{FC::ItemStorage.table_name} SET status='delete' WHERE item_id = #{item.id}") if options[:replace] && !storage
           # replace all fields
           item_params.each{|key, val| item.send("#{key}=", val)}
         else

data/lib/fc/policy.rb

@@ -32,7 +32,13 @@ module FC
     
     # get available storage for copy by copy_id and size
     def get_proper_storage_for_copy(size, copy_id = nil, exclude = [])
-      storages = get_copy_storages.select do |storage|
+      storages = get_copy_storages
+      start_storage_index = nil
+      storages.each_with_index do |s, i|
+        start_storage_index = i if copy_id.to_i == s.copy_id.to_i
+      end
+      storages = storages[start_storage_index..-1]+storages[0..start_storage_index-1] if storages.size > 0 && start_storage_index
+      storages = storages.select do |storage|
         !exclude.include?(storage.name) && storage.up? && storage.size + size < storage.size_limit
       end
       storage = storages.detect{|s| copy_id.to_i == s.copy_id.to_i}

data/lib/fc/version.rb

@@ -1,3 +1,3 @@
 module FC
-  VERSION = "0.0.9"
+  VERSION = "0.1.0"
 end

data/test/policy_test.rb

@@ -77,5 +77,11 @@ class PolicyTest < Test::Unit::TestCase
     @@policy.copy_storages = 'rec2-sda,rec3-sda,rec1-sda'
     @@policy.save
     assert_equal 'rec2-sda', @@policy.get_proper_storage_for_copy(1, 4).name, 'storage by copy_id'
+    
+    @@policy.copy_storages = 'rec3-sda,rec1-sda,rec2-sda,'
+    @@policy.save
+    @@storages[0].check_time = 0
+    @@storages[0].save
+    assert_equal 'rec2-sda', @@policy.get_proper_storage_for_copy(1, 1).name, 'storage by copy_id'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: filecluster
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-15 00:00:00.000000000 Z
+date: 2013-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb-readline
@@ -186,7 +186,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -919880063
+      hash: 2418971618198205266
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -195,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -919880063
+      hash: 2418971618198205266
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24