filecluster 0.5.26 → 0.5.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1ee01d84ce7df5b8ebe6279a92c0c14c488a5c82
-  data.tar.gz: 7e2f785e88144ed619e55cdec6bf038264278052
+SHA256:
+  metadata.gz: 62c0aba394cd7245330d1ec4b2e222fb500d5809310d12cc2e23fd96eb32153b
+  data.tar.gz: d22421a0ddd3f3810a42d19617976a911d8a2883cfb3c38aa4c2f83ff3c4874d
 SHA512:
-  metadata.gz: 7735a60395e14dac92d0078d60c63458ac795847e55292a6b4616e29f072d50b7417f74a6cf2bb0e775c0452b2706363f10b6d82aaafe41cd5b8d371bf242c89
-  data.tar.gz: 1e670216069549f82614300d99c53422e73782ab96c5e3ed459c32bc4d8b27dcc77eaa47b813a68e6a3a5d3fda0cc60f498e48435d19c1fab30ece49f0eee530
+  metadata.gz: 1617ecdbb68b3341677ff122eae10335af41508e996f3b70c6e8df48b690826f2052c6be6add92a9e3ccd44a238acb70dfe0fb246aab7d47ef471fd6969f8c3c
+  data.tar.gz: d2be6de927e6a056b727082a1dcd32ecdd8a5e66237e4b6b661bb4665eb65e29b3fd68f40183bfad5810746d877796e277bc29cb583dc7f366feaa2f53030eb6

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 #{options[:force_local_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/version.rb

@@ -1,3 +1,3 @@
 module FC
-  VERSION = '0.5.26'.freeze
+  VERSION = '0.5.29'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filecluster
 version: !ruby/object:Gem::Version
-  version: 0.5.26
+  version: 0.5.29
 platform: ruby
 authors:
 - sh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-28 00:00:00.000000000 Z
+date: 2022-04-28 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.6.14
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Distributed storage