filecluster 0.5.19 → 0.5.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: cc6dcb8fbcf81a564a087d60e5af17e9e636e262b942452945980b4bb2be8475
-  data.tar.gz: d8b18f330e1701ba93c9c05fdee1f31cf769bf319d46a3376e60ab72b3e2aa07
+SHA1:
+  metadata.gz: 8d483e4b277c06ca5555620bc5ae7f23f4e524d6
+  data.tar.gz: e7ee71236466346353c3ef599bd3bd29ac47551c
 SHA512:
-  metadata.gz: 566242919a5a563dcdeb80824875b10361b0a3cc4475a90b380f33157b4f7bb5dcdbd454143e8eacd01fcdb77ff720b8fbcdf4ba9e69b995433f7e8ed9da1b3a
-  data.tar.gz: 6d9e8bd6c13d062be2131f97e3b51c71f09ddf09a7e4a3852c16b7a0b14ae6977df6b99c32ccf1cf924f4bd8c9658824b6b4443cb8e68e21379d8cd110a1eace
+  metadata.gz: 4520da860c08b62f5815e39625c27c2e95d132dc1f3f135883ad6d83c2f4c8eff494544aa5874f96f0fbc8b578f7404f3f065613e8838bef858c518c70b440f4
+  data.tar.gz: 402c406c37d2c560df3da5a66f0a3c231c89b89edb542e19468fd2e151c3868ce338b223f3dcf364b14022ae34d28c0270b4b6d3c0610b81dd08935943c1b31c

data/README.md

@@ -64,6 +64,8 @@ Can be used the following variables:
 |daemon_global_error_items_ttl|86400|ttl for items with error status before delete|
 |daemon_global_error_items_storages_ttl|86400|ttl for items_storages with error status before delete|
 |daemon_restart_period|86400|time between fc-daemon self restart|
+|daemon_global_delete_limit|1000|limits number of deleted items per query|
+|daemon_global_delete_dela|1|delay in seconds(float) between items delete query|
 
 ## Usage
 

data/lib/daemon/check_thread.rb

@@ -1,4 +1,5 @@
 class CheckThread < BaseThread
+  require "net/http"
   def go(storage_name)
     $log.debug("CheckThread: Run stotage check for #{storage_name}")
     storage = $storages.detect{|s| s.name == storage_name}

data/lib/daemon/global_daemon_thread.rb

@@ -96,11 +96,15 @@ class GlobalDaemonThread < BaseThread
     $log.debug("GlobalDaemonThread: delete_deleted_items")
     
     r = FC::DB.query("SELECT i.id FROM #{FC::Item.table_name} as i LEFT JOIN #{FC::ItemStorage.table_name} as ist ON i.id=ist.item_id WHERE i.status = 'delete' AND ist.id IS NULL")
-    ids = r.map{|row| row['id']}
-    if ids.count > 0
+    item_ids = r.map{|row| row['id']}
+    limit = FC::Var.get('daemon_global_delete_limit', 1000).to_i
+    limit = 1000 if limit < 2
+    delay = FC::Var.get('daemon_global_delete_delay', 1).to_f
+    item_ids.each_slice(limit) do |ids|
       ids = ids.join(',')
       FC::DB.query("DELETE FROM #{FC::Item.table_name} WHERE id in (#{ids})")
       $log.info("GlobalDaemonThread: delete items #{ids}")
+      sleep delay if delay > 0
     end
   end
   

data/lib/fc/db.rb

@@ -4,7 +4,7 @@ require 'psych'
 module FC
   module DB
     class << self
-      attr_accessor :options, :prefix, :err_counter, :no_active_record, :connect_block, :logger, :reconnecting
+      attr_accessor :options, :prefix, :err_counter, :no_active_record, :connect_block, :logger, :reconnecting, :reconnect_block
     end
 
     def self.options_yml_path
@@ -20,7 +20,7 @@ module FC
       @prefix = @options[:prefix].to_s if @options[:prefix]
       connection = Mysql2::Client.new(@options)
       @reconnecting = false
-      @connect_block = nil
+      @connect_block = nil unless @options[:keep_lazy_connection]
       @connects = {} unless @connects
       @connects[Thread.current.object_id] = connection
     end
@@ -48,13 +48,22 @@ module FC
       @connect_block = block
     end
 
+    def self.lazy_reconnect(&block)
+      @reconnect_block = block
+    end
+
     def self.connect_by_block(options = {})
       connection = @connect_block.call
       @options = connection.query_options.clone.merge(symbolize_keys(options))
       @prefix = @options[:prefix].to_s if @options[:prefix]
       @connects = {} unless @connects
       @connects[Thread.current.object_id] = connection
-      @connect_block = nil
+      @connect_block = nil unless @options[:keep_lazy_connection]
+    end
+
+    def self.reconnect_by_block
+      @connects[Thread.current.object_id] = @reconnect_block.call
+      @reconnecting = false
     end
 
     def self.connect
@@ -86,7 +95,7 @@ module FC
     def self.reconnect
       close if connect
       @reconnecting = true
-      connect_by_config(@options)
+      @reconnect_block ? reconnect_by_block : connect_by_config(@options)
     end
     
     def self.close
@@ -343,5 +352,10 @@ module FC
     def self.migrate_6
       FC::DB.query("ALTER TABLE #{@prefix}storages ADD COLUMN http_check_time int(11) DEFAULT 0")
     end
+
+    def self.migrate_7
+      FC::DB.query("INSERT IGNORE INTO #{@prefix}vars SET name='daemon_global_delete_limit', val='1000', descr='limits number of deleted items per query'")
+      FC::DB.query("INSERT IGNORE INTO #{@prefix}vars SET name='daemon_global_delete_delay', val='1', descr='delay in seconds between items delete query'")
+    end
   end
 end

data/lib/fc/storage.rb

@@ -137,7 +137,7 @@ module FC
         raise r if $?.exitstatus != 0
       else
         local_path += '/' if File.stat(local_path).directory?
-        cmd = "ionice -c 2 -n 7 rsync -e \"ssh -o StrictHostKeyChecking=no\" -a --no-t #{FC::Storage.speed_limit_to_rsync_opt(speed_limit)}--rsync-path=\"#{recreate_dirs_cmd} && ionice -c 2 -n 7 rsync\" #{local_path.shellescape} #{self.host}:\"#{dst_path.shellescape}\""
+        cmd = "ionice -c 2 -n 7 rsync -e \"ssh -o StrictHostKeyChecking=no\" -a #{FC::Storage.speed_limit_to_rsync_opt(speed_limit)}--rsync-path=\"#{recreate_dirs_cmd} && ionice -c 2 -n 7 rsync\" #{local_path.shellescape} #{self.host}:\"#{dst_path.shellescape}\""
         r = `#{cmd} 2>&1`
         raise r if $?.exitstatus != 0
       end
@@ -155,7 +155,7 @@ module FC
       r = `#{cmd} 2>&1`
       src_path += '/' if $?.exitstatus == 0
 
-      cmd = "ionice -c 2 -n 7 rsync -e \"ssh -o StrictHostKeyChecking=no\" -a --no-t #{FC::Storage.speed_limit_to_rsync_opt(speed_limit)}--rsync-path=\"ionice -c 2 -n 7 rsync\" #{self.host}:\"#{src_path.shellescape}\" #{local_path.shellescape}"
+      cmd = "ionice -c 2 -n 7 rsync -e \"ssh -o StrictHostKeyChecking=no\" -a #{FC::Storage.speed_limit_to_rsync_opt(speed_limit)}--rsync-path=\"ionice -c 2 -n 7 rsync\" #{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.5.19'.freeze
+  VERSION = '0.5.25'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filecluster
 version: !ruby/object:Gem::Version
-  version: 0.5.19
+  version: 0.5.25
 platform: ruby
 authors:
 - sh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-03 00:00:00.000000000 Z
+date: 2020-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -217,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.9
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Distributed storage