filecluster 0.4.10 → 0.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e28f98d4fa88347c8ed87cf76acfbcb2e3b9029
-  data.tar.gz: 8ecadf4f538c78bd50119c94f89828955f84f1be
+  metadata.gz: 81a8deb986d25028bc35bcaa5e8eae3bd5f2631f
+  data.tar.gz: 5a10c3c2ccf9cbc6a3ad1677afcde8a364571872
 SHA512:
-  metadata.gz: b0af133c153134f9b02bcf1853296ab4cfbb09fee84043b3595d0be69863cbd57bca69f802a11299f4c859c09d3d38691a006bbbbb6729da5cf88d9d8651445f
-  data.tar.gz: 02982466b23fcd697e1c536535981d999a44f71dd069e2763c6bddf5dfe7ac4d1e2a66821e12f4d83f4a13b10c1bdcdf97c66f6d7cac0d1207a151470d356d8b
+  metadata.gz: ff27684b3bfbc4ecdd2a655db3f8ccd62464d50cdb122c0eb21a20dd83a2431d36895f03b95b75092a474ea89926fab5fd5342b85843f6658bec5d135a962949
+  data.tar.gz: 8d38c5bf40542c5c21ef033d45059cbe8beea14b8aa461182040d2c0733f0b5da6e81d5ee9067b937b9b39a41ea1aceff2ce70b134a9e9d4be672710f884a487

data/lib/daemon/global_daemon_thread.rb

@@ -60,7 +60,7 @@ class GlobalDaemonThread < BaseThread
             storage = src_storage.get_proper_storage_for_copy(row['size'], item_storages) unless storage
           end
           if storage
-            FC::Item.new(:id => row['item_id']).make_item_storage(storage, 'copy')
+            FC::Item.new(:id => row['item_id'], :size => row['size']).make_item_storage(storage, 'copy')
           else
             error 'No available storage', :item_id => row['item_id']
           end

data/lib/daemon/update_tasks_thread.rb

@@ -7,12 +7,16 @@ class UpdateTasksThread < BaseThread
   
   def check_tasks(type)
     count = 0
+    limit = FC::Var.get("daemon_tasks_#{type}_group_limit", 1000).to_i
     tasks = (type == :copy ? $tasks_copy : $tasks_delete) 
     $storages.each do |storage|
       tasks[storage.name] = [] unless tasks[storage.name]
-      cond = "storage_name = '#{storage.name}' AND status='#{type.to_s}'"
       ids = tasks[storage.name].map(&:id) + $curr_tasks.map(&:id)
-      limit = FC::Var.get("daemon_tasks_#{type}_group_limit", 1000).to_i
+      if ids.length > limit*2
+        $log.debug("Too many (#{ids.length}) #{type} tasks")
+        next
+      end
+      cond = "storage_name = '#{storage.name}' AND status='#{type.to_s}'"
       cond << "AND id not in (#{ids.join(',')})" if ids.length > 0
       cond << " LIMIT #{limit}"
       FC::ItemStorage.where(cond).each do |item_storage|

data/lib/fc/item.rb

@@ -23,6 +23,7 @@ module FC
       })
       item_params.delete(:replace)
       item_params.delete(:remove_local)
+      item_params.delete(:not_local)
       raise 'Name is empty' if item_params[:name].empty?
       raise 'Zero size path' if item_params[:size] == 0
 

data/lib/fc/storage.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 require 'shellwords'
+require 'fileutils'
 
 module FC
   class Storage < DbBase
@@ -112,17 +113,21 @@ module FC
     # delete object from storage
     def delete_file(file_name)
       dst_path = "#{self.path}#{file_name}"
-      cmd = self.class.curr_host == host ? 
-        "rm -rf #{dst_path.shellescape}" : 
-        "ssh -q -oBatchMode=yes -oStrictHostKeyChecking=no #{self.host} \"rm -rf #{dst_path.shellescape}\""
-      r = `#{cmd} 2>&1`
-      raise r if $?.exitstatus != 0
-      
-      cmd = self.class.curr_host == host ? 
-        "ls -la #{dst_path.shellescape}" : 
-        "ssh -q -oBatchMode=yes -oStrictHostKeyChecking=no #{self.host} \"ls -la #{dst_path.shellescape}\""
-      r = `#{cmd} 2>/dev/null`
-      raise "Path #{dst_path} not deleted" unless r.empty?
+      if self.class.curr_host == host
+        begin
+          File.delete(dst_path)
+        rescue Errno::EISDIR
+          FileUtils.rm_r(dst_path)
+        end
+      else
+        cmd = "ssh -q -oBatchMode=yes -oStrictHostKeyChecking=no #{self.host} \"rm -rf #{dst_path.shellescape}\""
+        r = `#{cmd} 2>&1`
+        raise r if $?.exitstatus != 0
+        
+        cmd = "ssh -q -oBatchMode=yes -oStrictHostKeyChecking=no #{self.host} \"ls -la #{dst_path.shellescape}\""
+        r = `#{cmd} 2>/dev/null`
+        raise "Path #{dst_path} not deleted" unless r.empty?
+      end
     end
     
     # return object size on storage

data/lib/fc/version.rb

@@ -1,3 +1,3 @@
 module FC
-  VERSION = "0.4.10"
+  VERSION = "0.4.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filecluster
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 0.4.11
 platform: ruby
 authors:
 - sh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-18 00:00:00.000000000 Z
+date: 2015-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2