filecluster 0.2.4 → 0.2.5

data/lib/daemon/global_daemon_thread.rb

@@ -80,12 +80,16 @@ class GlobalDaemonThread < BaseThread
   def make_deleted_error_items_storages
     $log.debug("GlobalDaemonThread: make_deleted_error_items_storages")
     ttl = FC::Var.get('daemon_global_error_items_storages_ttl', 86400).to_i
+    cnt = FC::DB.query("SELECT count(*) as cnt FROM #{FC::ItemStorage.table_name} WHERE status IN ('error', 'copy') AND time < #{Time.new.to_i - ttl}").first['cnt']
+    $log.debug("GlobalDaemonThread: mark deleted #{cnt} items storages")
     FC::DB.query("UPDATE #{FC::ItemStorage.table_name} SET status = 'delete' WHERE status IN ('error', 'copy') AND time < #{Time.new.to_i - ttl}")
   end
   
   def make_deleted_error_items
     $log.debug("GlobalDaemonThread: make_deleted_error_items")
     ttl = FC::Var.get('daemon_global_error_items_ttl', 86400).to_i
+    cnt = FC::DB.query("SELECT count(*) as cnt FROM #{FC::Item.table_name} WHERE status = 'error' AND time < #{Time.new.to_i - ttl}").first['cnt']
+    $log.debug("GlobalDaemonThread: mark deleted #{cnt} items")
     FC::DB.query("UPDATE #{FC::Item.table_name} SET status = 'delete' WHERE status = 'error' AND time < #{Time.new.to_i - ttl}")
   end
 end

data/lib/daemon/run_tasks_thread.rb

@@ -1,6 +1,6 @@
 class RunTasksThread < BaseThread
   def go
-    $log.debug('Run tasks (copy_count: #{$copy_count})')
+    $log.debug("Run tasks (copy_count: #{$copy_count})")
     $storages.each do |storage|
       $tasks_threads[storage.name] = [] unless $tasks_threads[storage.name]
       $tasks_threads[storage.name].delete_if {|thread| !thread.alive?}

data/lib/fc/item.rb

@@ -33,8 +33,6 @@ module FC
       item = FC::Item.where('name=? AND policy_id=?', item_params[:name], policy.id).first
       if item
         if options[:replace] || storage
-          # mark delete item_storages on replace
-          FC::DB.query("UPDATE #{FC::ItemStorage.table_name} SET status='delete' WHERE item_id = #{item.id}") if options[:replace] && !storage
           # replace all fields
           item_params.each{|key, val| item.send("#{key}=", val)}
         else
@@ -51,6 +49,10 @@ module FC
       else 
         storage = policy.get_proper_storage_for_create(item.size)
         FC::Error.raise 'No available storage', :item_id => item.id unless storage
+        
+        # mark delete item_storages on replace
+        FC::DB.query("UPDATE #{FC::ItemStorage.table_name} SET status='delete' WHERE item_id = #{item.id} AND storage_name <> '#{storage.name}'") if options[:replace]          
+        
         item_storage = item.make_item_storage(storage)
         item.copy_item_storage(local_path, storage, item_storage)
       end

data/lib/fc/version.rb

@@ -1,3 +1,3 @@
 module FC
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/test/daemon_test.rb

@@ -19,8 +19,8 @@ class DaemonTest < Test::Unit::TestCase
       
       FC::Var.set('daemon_cycle_time', 1)
       FC::Var.set('daemon_global_wait_time', 1)
-      FC::Var.set('daemon_global_error_items_storages_ttl', 0)
-      FC::Var.set('daemon_global_error_items_ttl', 0)
+      FC::Var.set('daemon_global_error_items_storages_ttl', 2)
+      FC::Var.set('daemon_global_error_items_ttl', 2)
       @stotage_checks = 0
       Thread.new do
         Open3.popen2e("#{daemon_bin} -c #{db_config_file} -l debug -h host1") do |stdin, stdout, t|
@@ -113,7 +113,7 @@ class DaemonTest < Test::Unit::TestCase
     @item3.status = 'error'
     @item3.save
     
-    sleep 2
+    sleep 6
     assert_raise(RuntimeError, "Item not deleted after mark_deleted") {@item1.reload}
     assert_equal 0, FC::ItemStorage.where('item_id = ?', @item2.id).count, "ItemStorages not deleted after status='error'"
     @item3.reload

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: filecluster
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-18 00:00:00.000000000 Z
+date: 2013-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb-readline
@@ -192,7 +192,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4358767098397896012
+      hash: -2450197837742993053
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -201,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4358767098397896012
+      hash: -2450197837742993053
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24