filecluster 0.3.1 → 0.3.2

data/bin/fc-daemon

@@ -58,7 +58,8 @@ start_time = Time.new.to_i
 while true do
   if $exit_signal
     $log.debug('wait tasks_threads')
-    $tasks_threads.each {|t| t.join}
+    $tasks_copy_threads.each {|t| t.join}
+    $tasks_delete_threads.each {|t| t.join}
     if $global_daemon_thread
       $log.debug('wait global_daemon_thread')
       $global_daemon_thread.join

data/lib/daemon/copy_task_thread.rb

@@ -4,7 +4,7 @@ class CopyTaskThread < BaseThread
     Thread.current[:tasks_processed] = 0 unless Thread.current[:tasks_processed]
     while task = $tasks_copy[storage_name].shift do
       $curr_tasks << task
-      $log.debug("CopyTaskThread(#{storage_name}): run task for item_storage ##{task.id}")
+      $log.debug("CopyTaskThread(#{storage_name}): run task for item_storage ##{task.id}, copy_count=#{$copy_count}")
       make_copy(task)
       $curr_tasks.delete(task)
       $log.debug("CopyTaskThread(#{storage_name}): finish task for item_storage ##{task.id}")

data/lib/daemon/global_daemon_thread.rb

@@ -29,17 +29,6 @@ class GlobalDaemonThread < BaseThread
     all_storages = FC::Storage.where
     all_policies = FC::Policy.where
     
-    # policies.get_storages => all_policies.select
-    all_storages.each do |storage|
-      metaclass = class << storage; self; end
-      metaclass.send(:define_method, :get_copy_storages) do
-        self.class.get_copy_storages_mutex.synchronize do
-          @copy_storages_cache ||= self.copy_storages.to_s.split(',').map{|storage_name| all_storages.detect{|s| storage_name == s.name} }
-        end
-        @copy_storages_cache
-      end
-    end
-    
     limit = FC::Var.get('daemon_global_tasks_group_limit', 1000).to_i
     all_policies.each do |policy|
       next if policy.copies.to_i < 2

data/lib/fc/storage.rb

@@ -61,7 +61,7 @@ module FC
       
       cmd = self.class.curr_host == host ? 
         "cp -r #{local_path.shellescape} #{dst_path.shellescape}" : 
-        "scp -rB #{local_path.shellescape} #{self.host}:\"#{dst_path.shellescape}\""
+        "scp -r -oBatchMode=yes -oStrictHostKeyChecking=no #{local_path.shellescape} #{self.host}:\"#{dst_path.shellescape}\""
       r = `#{cmd} 2>&1`
       raise r if $?.exitstatus != 0
     end
@@ -75,7 +75,7 @@ module FC
       
       cmd = self.class.curr_host == host ? 
         "cp -r #{src_path.shellescape} #{local_path.shellescape}" : 
-        "scp -rB #{self.host}:\"#{src_path.shellescape}\" #{local_path.shellescape}"
+        "scp -r -oBatchMode=yes -oStrictHostKeyChecking=no #{self.host}:\"#{src_path.shellescape}\" #{local_path.shellescape}"
       r = `#{cmd} 2>&1`
       raise r if $?.exitstatus != 0
     end

data/lib/fc/version.rb

@@ -1,3 +1,3 @@
 module FC
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: filecluster
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-12 00:00:00.000000000 Z
+date: 2014-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb-readline
@@ -193,7 +193,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4221257389535843985
+      hash: 1925480104148828802
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -202,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4221257389535843985
+      hash: 1925480104148828802
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24