filecluster 0.2.5 → 0.2.6

data/lib/daemon/global_daemon_thread.rb

@@ -33,7 +33,10 @@ class GlobalDaemonThread < BaseThread
     all_policies.each do |policy|
       metaclass = class << policy; self; end
       metaclass.send(:define_method, :get_copy_storages) do
-        @copy_storages_cache ||= self.copy_storages.split(',').map{|storage_name| all_storages.detect{|s| storage_name == s.name} }
+        self.class.get_copy_storages_mutex.synchronize do
+          @copy_storages_cache ||= self.copy_storages.split(',').map{|storage_name| all_storages.detect{|s| storage_name == s.name} }
+        end
+        @copy_storages_cache
       end
     end
     

data/lib/fc/policy.rb

@@ -5,9 +5,11 @@ module FC
     set_table :policies, 'name, create_storages, copy_storages, copies'
     
     class << self
-      attr_accessor :storages_cache_time
+      attr_accessor :storages_cache_time, :get_create_storages_mutex, :get_copy_storages_mutex
     end
     @storages_cache_time = 20 # ttl for storages cache
+    @get_create_storages_mutex = Mutex.new
+    @get_copy_storages_mutex = Mutex.new
     
     def self.filter_by_host(host = nil)
       host = FC::Storage.curr_host unless host
@@ -17,17 +19,25 @@ module FC
     end
     
     def get_create_storages
-      return @create_storages_cache if @create_storages_cache && Time.new.to_i - @get_create_storages_time.to_i < self.class.storages_cache_time
-      @get_create_storages_time = Time.new.to_i
-      names = create_storages.split(',').map{|s| "'#{s}'"}.join(',')
-      @create_storages_cache = FC::Storage.where("name IN (#{names}) ORDER BY FIELD(name, #{names})")
+      self.class.get_create_storages_mutex.synchronize do
+        unless @create_storages_cache && Time.new.to_i - @get_create_storages_time.to_i < self.class.storages_cache_time
+          @get_create_storages_time = Time.new.to_i
+          names = create_storages.split(',').map{|s| "'#{s}'"}.join(',')
+          @create_storages_cache = FC::Storage.where("name IN (#{names}) ORDER BY FIELD(name, #{names})")
+        end
+      end
+      @create_storages_cache
     end
     
     def get_copy_storages
-      return @copy_storages_cache if @copy_storages_cache && Time.new.to_i - @get_copy_storages_time.to_i < self.class.storages_cache_time
-      @get_copy_storages_time = Time.new.to_i
-      names = copy_storages.split(',').map{|s| "'#{s}'"}.join(',')
-      @copy_storages_cache = FC::Storage.where("name IN (#{names}) ORDER BY FIELD(name, #{names})")
+      self.class.get_copy_storages_mutex.synchronize do
+        unless @copy_storages_cache && Time.new.to_i - @get_copy_storages_time.to_i < self.class.storages_cache_time
+          @get_copy_storages_time = Time.new.to_i
+          names = copy_storages.split(',').map{|s| "'#{s}'"}.join(',')
+          @copy_storages_cache = FC::Storage.where("name IN (#{names}) ORDER BY FIELD(name, #{names})")
+        end
+      end
+      @copy_storages_cache
     end
     
     # get available storage for create by size
@@ -53,8 +63,8 @@ module FC
       storages = (storages[storage_index..-1]+storages[0..storage_index-1]).select do |s|
         !exclude.include?(s.name) && s.up? && s.size + size < s.size_limit
       end
-      storage = storages.select{|s| storage_host == s.host}.sort{|a,b| b.copy_id.to_i <=> a.copy_id.to_i}.first
-      storage = storages.sort{|a,b| b.copy_id.to_i <=> a.copy_id.to_i}.first unless storage
+      storage = storages.select{|s| storage_host == s.host}.sort{|a,b| (copy_id.to_i - a.copy_id.to_i).abs <=> (copy_id.to_i - b.copy_id.to_i).abs}.first
+      storage = storages.sort{|a,b| (copy_id.to_i - a.copy_id.to_i).abs <=> (copy_id.to_i - b.copy_id.to_i).abs}.first unless storage
       storage
     end
   end

data/lib/fc/var.rb

@@ -5,14 +5,17 @@ module FC
     class << self
       attr_accessor :cache_time
     end
+    @mutex = Mutex.new
     @cache_time = 120 # ttl for get_all
     @all_vars = {}
     
     def self.set(name, val)
-      FC::DB.query("UPDATE #{FC::DB.prefix}vars SET val='#{Mysql2::Client.escape(val.to_s)}' WHERE name='#{Mysql2::Client.escape(name.to_s)}'")
-      FC::DB.query("INSERT IGNORE INTO #{FC::DB.prefix}vars SET val='#{Mysql2::Client.escape(val.to_s)}', name='#{Mysql2::Client.escape(name.to_s)}'")
-      @all_vars[name.to_s] = val.to_s
-      @all_vars[name.to_sym] = val.to_s
+      @mutex.synchronize do
+        FC::DB.query("UPDATE #{FC::DB.prefix}vars SET val='#{Mysql2::Client.escape(val.to_s)}' WHERE name='#{Mysql2::Client.escape(name.to_s)}'")
+        FC::DB.query("INSERT IGNORE INTO #{FC::DB.prefix}vars SET val='#{Mysql2::Client.escape(val.to_s)}', name='#{Mysql2::Client.escape(name.to_s)}'")
+        @all_vars[name.to_s] = val.to_s
+        @all_vars[name.to_sym] = val.to_s
+      end
     end
     
     def self.get(name, default_value = nil)
@@ -20,13 +23,15 @@ module FC
     end
     
     def self.get_all
-      if !@get_all_read_time || Time.new.to_i - @get_all_read_time > cache_time
-        @all_vars = {}
-        FC::DB.query("SELECT * FROM #{FC::DB.prefix}vars").each do |row|
-          @all_vars[row['name']] = row['val']
-          @all_vars[row['name'].to_sym] = row['val']
+      @mutex.synchronize do
+        if !@get_all_read_time || Time.new.to_i - @get_all_read_time > cache_time
+          @all_vars = {}
+          FC::DB.query("SELECT * FROM #{FC::DB.prefix}vars").each do |row|
+            @all_vars[row['name']] = row['val']
+            @all_vars[row['name'].to_sym] = row['val']
+          end
+          @get_all_read_time = Time.new.to_i
         end
-        @get_all_read_time = Time.new.to_i
       end
       @all_vars 
     end

data/lib/fc/version.rb

@@ -1,3 +1,3 @@
 module FC
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/test/policy_test.rb

@@ -70,11 +70,11 @@ class PolicyTest < Test::Unit::TestCase
     
     @@policy.copy_storages = 'rec3-sda,rec1-sda,rec2-sda'
     @@policy.save
-    assert_equal 'rec3-sda', @@policy.get_proper_storage_for_copy(1).name, 'first storage in copy_storages'
+    assert_equal 'rec1-sda', @@policy.get_proper_storage_for_copy(1).name, 'storage with min copy_id in copy_storages'
     assert_equal 'rec2-sda', @@policy.get_proper_storage_for_copy(1, 2).name, 'storage by copy_id'
     @@policy.copy_storages = 'rec1-sda,rec3-sda'
     @@policy.save
-    assert_equal 'rec3-sda', @@policy.get_proper_storage_for_copy(1, 2).name, 'storage by copy_id'
+    assert_equal 'rec1-sda', @@policy.get_proper_storage_for_copy(1, 2).name, 'storage by copy_id'
     @@policy.copy_storages = 'rec3-sda,rec1-sda,rec2-sda,rec2-sdb'
     @@policy.save
     assert_equal 'rec2-sda', @@policy.get_proper_storage_for_copy(1, 4).name, 'storage by copy_id'
@@ -87,7 +87,7 @@ class PolicyTest < Test::Unit::TestCase
     @@policy.save
     @@storages[0].check_time = 0
     @@storages[0].save
-    assert_equal 'rec3-sda', @@policy.get_proper_storage_for_copy(1, 1).name, 'storage by copy_id'
+    assert_equal 'rec2-sda', @@policy.get_proper_storage_for_copy(1, 1).name, 'storage by copy_id'
   end
   
   should "filter_by_host" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: filecluster
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-24 00:00:00.000000000 Z
+date: 2013-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb-readline
@@ -192,7 +192,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2450197837742993053
+      hash: 3411895741076242860
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -201,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2450197837742993053
+      hash: 3411895741076242860
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24