filecluster 0.5.24 → 0.5.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89d3074974713ab1d820dca546ec70cb2fe3230348e30482e8edaae425a6c615
-  data.tar.gz: 9830d0fb5c1acbd702a26217bb9d107ad07d126ea6b60d9dad5165033197f59f
+  metadata.gz: 9de6ac005874dd4c6bcb167cc9c71b6417f384c4116668ebcda03f6741f3a2ce
+  data.tar.gz: ec2aff79aff42a1b27d68168d2260e8720b676542bf2563ffcbc03a6880c7d37
 SHA512:
-  metadata.gz: c4a90b722c7044b0aa4b5c814a705dfcfe8ff3d0e2491f61dac41eec77f2c1045172ecbe6a2103d789cff0a7771aebbcca1de04ef9f9a3767fe643f07e3c538b
-  data.tar.gz: 92c761b6785ed30d6b906fbfa4fed340aea14aea3cf150567be84bea4e0b91447decd0b6b6c5eb53406cebedc055712ed31b9f04005bb7699ae32af728e90cc7
+  metadata.gz: bf0c2a5c574e188f9af197b0acf9d328cf49eee1b89708b52f96b63cd3b60c974c2d9f832790619648cf3e67ec8904072965623b2afad01149668e9f13b9d4da
+  data.tar.gz: 96e31037d021574d7e6c033dea7a7c5fe685c8166b72ed257d41d8b115c23d0fe3d8892a94ed43bd8cdca31ce6fc1d222242aff297c55c762cfe56c51f9bd649

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/copy_task_thread.rb

@@ -48,6 +48,7 @@ class CopyTaskThread < BaseThread
     rescue Exception => e
       if e.message.match('Record not found')
         $log.warn("Item ##{task.item_id} not found before copy")
+        task.delete
         return nil
       else 
         raise e

data/lib/daemon/delete_task_thread.rb

@@ -20,6 +20,7 @@ class DeleteTaskThread < BaseThread
     rescue Exception => e
       if e.message.match('Record not found')
         $log.warn("Item ##{task.item_id} not found before delete")
+        task.delete
         return nil
       else 
         raise e

data/lib/fc/item.rb

@@ -13,6 +13,7 @@ module FC
     #   :additional_fields - hash of additional FC:Item fields 
     #   :no_md5 - don't use md5
     #   :speed_limit - limit copy speed
+    #   :force_local_storage_name
     # If item_name is part of local_path it processed as inplace - local_path is valid path to the item for policy
     def self.create_from_local(local_path, item_name, policy, options={}, &block)
       raise 'Path not exists' unless File.exists?(local_path)
@@ -32,14 +33,25 @@ module FC
       item_params.delete(:not_local)
       item_params.delete(:no_md5)
       item_params.delete(:speed_limit)
+      item_params.delete(:force_local_storage_name)
       raise 'Name is empty' if item_params[:name].empty?
       raise 'Zero size path' if item_params[:size] == 0
 
       if local_path.include?(item_name) && !options[:not_local]
-        storage = policy.get_create_storages.detect do |s|
-          s.host == FC::Storage.curr_host && local_path.index(s.path) == 0 && local_path.sub(s.path, '').sub(/\/$/, '').sub(/^\//, '') == item_params[:name]
+        if options[:force_local_storage_name]
+          storage = policy.get_create_storages.detect do |s|
+            s.name == options[:force_local_storage_name]
+          end
+          FC::Error.raise "force_local_storage #{storage.name} is not valid path for policy ##{policy.id}" unless storage
+          if local_path.index(storage.path) != 0 || local_path.sub(storage.path, '').sub(/\/$/, '').sub(/^\//, '') != item_params[:name]
+            FC::Error.raise "force_local_storage #{storage.name} is not valid path for local path ##{local_path}"
+          end
+        else
+          storage = policy.get_create_storages.detect do |s|
+            s.host == FC::Storage.curr_host && local_path.index(s.path) == 0 && local_path.sub(s.path, '').sub(/\/$/, '').sub(/^\//, '') == item_params[:name]
+          end
+          FC::Error.raise "local_path #{local_path} is not valid path for policy ##{policy.id}" unless storage
         end
-        FC::Error.raise "local_path #{local_path} is not valid path for policy ##{policy.id}" unless storage
       end
 
       # new item?

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.24'.freeze
+  VERSION = '0.5.28'.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.24
+  version: 0.5.28
 platform: ruby
 authors:
 - sh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-26 00:00:00.000000000 Z
+date: 2021-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -216,8 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.9
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Distributed storage