filecluster 0.5.21 → 0.5.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4bca4b52453d8184c6b3aa8f6915a4077c92fdefbc5a8c3690031d0dbfeeebdc
-  data.tar.gz: 7387acb1f8c92b285311425b8ccb26da2ea05ad5fb35759d2e110fb6035da4a7
+  metadata.gz: 10e10527f25a50e402b200e74a8e130f01455254fb8532a3c21b41745634309c
+  data.tar.gz: 316f0184215fa4e23069de2141562aca7b5f0bd1b58d518e2bfd230e597cca74
 SHA512:
-  metadata.gz: 77502723c7312da226e1207527fa57654646077cffc5fed30ec2c83c99330e30851b4951e79dbab09374d95ff49904f1db7a442225a393b5d9dd58c39de8f4cc
-  data.tar.gz: e814ddae4b981950bb78f585704d5b5c9fe7d2801cac3f807c9f42ff1e85a8709202ee6b8ace7cc3f38294a11688fca27fc66f00f52e00dc69581c9f9bfb9607
+  metadata.gz: 619b4b7999ece7b80a2077fdd010675b61ca950c355c1fb10eaad99b39b0f50b39f865f50b52d5cfff8d8e99851ac0d204125534dc4fdcf9da3296e07de71061
+  data.tar.gz: db6a19f940784f459c5f4ad72cee8a580a5399be0867fe38698b08d643808accbe60718e1d2313936096ae26a0bc3afb481cd4e846e08c0c866de040763b7be5

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/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

@@ -343,5 +343,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/version.rb

@@ -1,3 +1,3 @@
 module FC
-  VERSION = '0.5.21'.freeze
+  VERSION = '0.5.22'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filecluster
 version: !ruby/object:Gem::Version
-  version: 0.5.21
+  version: 0.5.22
 platform: ruby
 authors:
 - sh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-11 00:00:00.000000000 Z
+date: 2020-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2