filecluster 0.5.21 → 0.5.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 4bca4b52453d8184c6b3aa8f6915a4077c92fdefbc5a8c3690031d0dbfeeebdc
-  data.tar.gz: 7387acb1f8c92b285311425b8ccb26da2ea05ad5fb35759d2e110fb6035da4a7
+SHA1:
+  metadata.gz: 1ee01d84ce7df5b8ebe6279a92c0c14c488a5c82
+  data.tar.gz: 7e2f785e88144ed619e55cdec6bf038264278052
 SHA512:
-  metadata.gz: 77502723c7312da226e1207527fa57654646077cffc5fed30ec2c83c99330e30851b4951e79dbab09374d95ff49904f1db7a442225a393b5d9dd58c39de8f4cc
-  data.tar.gz: e814ddae4b981950bb78f585704d5b5c9fe7d2801cac3f807c9f42ff1e85a8709202ee6b8ace7cc3f38294a11688fca27fc66f00f52e00dc69581c9f9bfb9607
+  metadata.gz: 7735a60395e14dac92d0078d60c63458ac795847e55292a6b4616e29f072d50b7417f74a6cf2bb0e775c0452b2706363f10b6d82aaafe41cd5b8d371bf242c89
+  data.tar.gz: 1e670216069549f82614300d99c53422e73782ab96c5e3ed459c32bc4d8b27dcc77eaa47b813a68e6a3a5d3fda0cc60f498e48435d19c1fab30ece49f0eee530

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,5 +1,9 @@
 class CheckThread < BaseThread
   require "net/http"
+
+  @@storage_http_check = {}
+  HTTP_RETRIES = 3
+
   def go(storage_name)
     $log.debug("CheckThread: Run stotage check for #{storage_name}")
     storage = $storages.detect{|s| s.name == storage_name}
@@ -10,7 +14,7 @@ class CheckThread < BaseThread
     else 
       error "Storage #{storage.name} with path #{storage.path} not writable"
     end
-    check_http(storage)
+    check_http(storage) if storage.http_check_enabled?
     $log.debug("CheckThread: Finish stotage check for #{storage_name}")
   end
 
@@ -22,8 +26,10 @@ class CheckThread < BaseThread
     resp = request.start { |http| http.get(uri.path) } rescue nil
     if resp && resp.code.to_i == 200 && resp.body.to_s.chomp == 'OK'
       storage.update_http_check_time
+      @@storage_http_check[storage.name] = 0
     else
-      error "Storage #{storage.name} with url #{storage.url} not readable"
+      @@storage_http_check[storage.name] = @@storage_http_check[storage.name].to_i + 1
+      error("Storage #{storage.name} with url #{storage.url} not readable") if @@storage_http_check[storage.name] > HTTP_RETRIES
     end
   rescue => err
     $log.error("CheckThread: check_http error: #{err}")

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

@@ -95,6 +95,7 @@ module FC
     end
 
     def update_http_check_time
+      return unless http_check_enabled?
       self.http_check_time = Time.new.to_i
       save
     end
@@ -104,9 +105,13 @@ module FC
     end
 
     def http_check_time_delay
-      Time.new.to_i - http_check_time.to_i
+      http_check_enabled? ? Time.new.to_i - http_check_time.to_i : 0
     end
     
+    def http_check_enabled?
+      http_check_time.to_i >= 0
+    end
+
     def up?
       check_time_delay < self.class.check_time_limit
     end
@@ -137,7 +142,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 +160,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.21'.freeze
+  VERSION = '0.5.26'.freeze
 end

data/lib/manage/storages.rb

@@ -20,21 +20,22 @@ def storages_show
   if storage = find_storage
     count = FC::DB.query("SELECT count(*) as cnt FROM #{FC::ItemStorage.table_name} WHERE storage_name='#{Mysql2::Client.escape(storage.name)}'").first['cnt']
     puts %Q{Storage
-  Name:           #{storage.name}
-  Host:           #{storage.host} 
-  DC:             #{storage.dc}
-  Path:           #{storage.path} 
-  Url:            #{storage.url}
-  Url weight:     #{storage.url_weight}
-  Write weight    #{storage.write_weight}
-  Size:           #{size_to_human storage.size} (#{(storage.size_rate*100).to_i}%)
-  Free:           #{size_to_human storage.free} (#{(storage.free_rate*100).to_i}%) 
-  Size limit:     #{size_to_human storage.size_limit}
-  Size type:      #{storage.auto_size? ? "Auto (min #{ size_to_human storage.auto_size })" : 'Static'}
-  Copy storages:  #{storage.copy_storages}
-  Check time:     #{storage.check_time ? "#{Time.at(storage.check_time)} (#{storage.check_time_delay} seconds ago)" : ''}
-  Status:         #{storage.up? ? colorize_string('UP', :green) : colorize_string('DOWN', :red)}
-  Items storages: #{count}}
+  Name:            #{storage.name}
+  Host:            #{storage.host}
+  DC:              #{storage.dc}
+  Path:            #{storage.path}
+  Url:             #{storage.url}
+  Url weight:      #{storage.url_weight}
+  Write weight     #{storage.write_weight}
+  Size:            #{size_to_human storage.size} (#{(storage.size_rate*100).to_i}%)
+  Free:            #{size_to_human storage.free} (#{(storage.free_rate*100).to_i}%)
+  Size limit:      #{size_to_human storage.size_limit}
+  Size type:       #{storage.auto_size? ? "Auto (min #{ size_to_human storage.auto_size })" : 'Static'}
+  Copy storages:   #{storage.copy_storages}
+  Check time:      #{storage.check_time ? "#{Time.at(storage.check_time)} (#{storage.check_time_delay} seconds ago)" : ''}
+  Check http time: #{storage.http_check_enabled? ? "#{Time.at(storage.http_check_time)} (#{storage.http_check_time_delay} seconds ago)" : 'disabled'}
+  Status:          #{storage.up? ? colorize_string('UP', :green) : colorize_string('DOWN', :red)}
+  Items storages:  #{count}}
   end
 end
 
@@ -56,13 +57,14 @@ def storages_add
     size_limit = human_to_size stdin_read_val('Size limit') {|val| "Size limit not is valid size." unless human_to_size(val)}
   end
 
+  check_http = %(y yes).include?(stdin_read_val('Check http (y/n)?').downcase) ? 0 : -1
   copy_storages = stdin_read_val('Copy storages', true)
   storages = FC::Storage.where.map(&:name)
   copy_storages = copy_storages.split(',').select{|s| storages.member?(s.strip)}.join(',').strip
   begin
     path = path +'/' unless path[-1] == '/'
     path = '/' + path unless path[0] == '/'
-    storage = FC::Storage.new(:name => name, :dc => dc, :host => host, :path => path, :url => url, :size_limit => size_limit, :copy_storages => copy_storages, :url_weight => url_weight, :write_weight => write_weight, :auto_size => auto_size)
+    storage = FC::Storage.new(:name => name, :dc => dc, :host => host, :path => path, :url => url, :size_limit => size_limit, :copy_storages => copy_storages, :url_weight => url_weight, :write_weight => write_weight, :auto_size => auto_size, :http_check_time => check_http)
     print 'Calc current size.. '
     size = storage.file_size('', true)
     puts "ok"
@@ -88,6 +90,7 @@ def storages_add
   Free:         #{size_to_human free} (#{(free.to_f*100 / size_limit).to_i}%)
   Size type:    #{storage.auto_size? ? "Auto (min #{ size_to_human(auto_size) })" : 'Static' }
   Size limit:   #{size_to_human size_limit}
+  Check http:   #{storage.http_check_enabled? ? 'yes' : 'no' }
   Copy storages #{copy_storages}}
   s = Readline.readline("Continue? (y/n) ", false).strip.downcase
   puts ""
@@ -152,6 +155,7 @@ def storages_change
       auto_size = 0
       size_limit = stdin_read_val("Size (now #{size_to_human(storage.size_limit)})", true) {|val| "Size limit not is valid size." if !val.empty? && !human_to_size(val)}
     end
+    check_http = %(y yes).include?(stdin_read_val("Check http (now #{storage.http_check_enabled? ? 'yes' : 'no'})", true, storage.http_check_enabled? ? 'yes' : 'no').downcase)
     copy_storages = stdin_read_val("Copy storages (now #{storage.copy_storages})", true)
     
     storage.dc = dc unless dc.empty?
@@ -172,7 +176,7 @@ def storages_change
     storage.size_limit = human_to_size(size_limit) unless size_limit.empty?
     storages = FC::Storage.where.map(&:name)
     storage.copy_storages = copy_storages.split(',').select{|s| storages.member?(s.strip)}.join(',').strip unless copy_storages.empty?
-    
+    storage.http_check_time = (check_http ? 0 : -1) if storage.http_check_enabled? != check_http
     puts %Q{\nStorage
     Name:          #{storage.name}
     DC:            #{storage.dc}
@@ -185,6 +189,7 @@ def storages_change
     Free:          #{size_to_human storage.free} (#{(storage.free_rate*100).to_i}%)
     Size type:     #{storage.auto_size? ? "Auto (Min #{size_to_human auto_size})" : 'Static' }
     Size limit:    #{size_to_human storage.size_limit }
+    Check http:    #{storage.http_check_enabled? ? 'yes' : 'no' }
     Copy storages: #{storage.copy_storages}}
     s = Readline.readline("Continue? (y/n) ", false).strip.downcase
     puts ""

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filecluster
 version: !ruby/object:Gem::Version
-  version: 0.5.21
+  version: 0.5.26
 platform: ruby
 authors:
 - sh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-11 00:00:00.000000000 Z
+date: 2020-08-28 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