filecluster 0.4.0 → 0.4.1

data/lib/fc/item.rb

@@ -8,6 +8,7 @@ module FC
     # Create item by local path.
     # Additional options: 
     #   :replace=true - replace item if it exists
+    #   :remove_local=true - delete local_path file/dir after add
     # 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={})
       raise 'Path not exists' unless File.exists?(local_path)
@@ -20,7 +21,7 @@ module FC
         :md5 => FC::Storage.new(:host => FC::Storage.curr_host).md5_sum(local_path)
       })
       item_params.delete(:replace)
-      item_params.delete(:inplace)
+      item_params.delete(:remove_local)
       raise 'Name is empty' if item_params[:name].empty?
       raise 'Zero size path' if item_params[:size] == 0
 
@@ -49,14 +50,14 @@ module FC
         item_storage = item.make_item_storage(storage, 'ready')
         item.reload
       else
-        storage = policy.get_proper_storage_for_create(item.size, File.realdirpath(local_path))
+        storage = policy.get_proper_storage_for_create(item.size, local_path)
         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)
+        item.copy_item_storage(local_path, storage, item_storage, options[:remove_local])
       end
       
       return item
@@ -72,12 +73,12 @@ module FC
       item_storage
     end
     
-    def copy_item_storage(src, storage, item_storage)
+    def copy_item_storage(src, storage, item_storage, remove_local = false)
       begin
         if src.instance_of?(FC::Storage)
           src.copy_to_local(name, "#{storage.path}#{name}")
         else
-          storage.copy_path(src, name)
+          storage.copy_path(src, name, remove_local)
         end
         md5_on_storage = storage.md5_sum(name)
       rescue Exception => e
@@ -98,6 +99,7 @@ module FC
             item_storage.status = 'ready'
             item_storage.save
             reload
+            File.delete(src) if remove_local && !src.instance_of?(FC::Storage) && File.exists?(src)
           end
         end
       end

data/lib/fc/policy.rb

@@ -38,12 +38,14 @@ module FC
     # get available storage for create by size and local item path
     def get_proper_storage_for_create(size, local_path = nil)
       storages = get_proper_storages_for_create(size)
+      dev = File.stat(local_path).dev if local_path
+      
       # sort by current_host and free size
       storages.sort do |a, b|
         if FC::Storage.curr_host == a.host && FC::Storage.curr_host == b.host
-          if local_path && local_path.index(a.path) == 0
+          if local_path && dev == File.stat(a.path).dev
             1
-          elsif local_path && local_path.index(b.path) == 0
+          elsif local_path && dev == File.stat(b.path).dev
             -1
           else
             a.free_rate <=> b.free_rate

data/lib/fc/storage.rb

@@ -63,16 +63,17 @@ module FC
     end
     
     # copy local_path to storage
-    def copy_path(local_path, file_name)
+    def copy_path(local_path, file_name, try_move = false)
       dst_path = "#{self.path}#{file_name}"
 
       cmd = "rm -rf #{dst_path.shellescape}; mkdir -p #{File.dirname(dst_path).shellescape}"
       cmd = self.class.curr_host == host ? cmd : "ssh -oBatchMode=yes -oStrictHostKeyChecking=no #{self.host} \"#{cmd}\""
       r = `#{cmd} 2>&1`
       raise r if $?.exitstatus != 0
-
+      
+      op = try_move && self.class.curr_host == host && File.stat(local_path).dev == File.stat(File.dirname(dst_path)).dev ? 'mv' : 'cp -r'
       cmd = self.class.curr_host == host ?
-        "cp -r #{local_path.shellescape} #{dst_path.shellescape}" :
+        "#{op} #{local_path.shellescape} #{dst_path.shellescape}" :
         "scp -r -oBatchMode=yes -oStrictHostKeyChecking=no #{local_path.shellescape} #{self.host}:\"#{dst_path.shellescape}\""
       r = `#{cmd} 2>&1`
       raise r if $?.exitstatus != 0

data/lib/fc/version.rb

@@ -1,3 +1,3 @@
 module FC
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/test/functional_test.rb

@@ -122,4 +122,16 @@ class FunctionalTest < Test::Unit::TestCase
     `cp #{@@test_file_path.shellescape} #{tmp_dir_path.shellescape}`
     assert_nothing_raised { FC::Item.create_from_local(tmp_dir_path, '/inplace test dir/', @@policies[0]) }
   end
+  
+  should "item create_from_local with move and delete" do
+    tmp_file_path = "/tmp/fc test file for delete"
+    `cp #{@@test_file_path.shellescape} #{tmp_file_path.shellescape}`
+    File.stubs(:delete).never
+    assert_nothing_raised { @item = FC::Item.create_from_local(tmp_file_path, '/bla/bla/test6', @@policies[0], {:remove_local => true}) }
+    assert_kind_of FC::Item, @item
+    assert_equal `du -sb #{@@test_file_path.shellescape} 2>&1`.to_i, @item.size
+    assert_equal 'ready', @item.status
+    assert_equal false, File.exists?(tmp_file_path)
+    File.unstub(:delete)
+  end
 end

data/test/policy_test.rb

@@ -58,16 +58,20 @@ class PolicyTest < Test::Unit::TestCase
     FC::Policy.storages_cache_time = 0
     @@storages.each {|storage| storage.update_check_time}
     FC::Storage.stubs(:curr_host).returns('rec2')
-    assert_equal 'rec2-sdb', @@policy.get_proper_storage_for_create(9, '/tmp/host2-sdb/test').name, 'current host, local path match'
+    File.stubs(:stat).with('test-rec2-sdb').returns(OpenStruct.new :dev => 10)
+    File.stubs(:stat).with('/tmp/host2-sdb/').returns(OpenStruct.new :dev => 10)
+    File.stubs(:stat).with{|s| s != 'test-rec2-sdb' && s != '/tmp/host2-sdb/'}.returns(OpenStruct.new :dev => 0)
+    assert_equal 'rec2-sdb', @@policy.get_proper_storage_for_create(9, 'test-rec2-sdb').name, 'current host, dev match'
     @@storages[3].check_time = 0;
     @@storages[3].save
-    assert_equal 'rec2-sdc', @@policy.get_proper_storage_for_create(9, '/tmp/host2-sdb/test').name, 'current host, most free storage'
+    assert_equal 'rec2-sdc', @@policy.get_proper_storage_for_create(9, 'test-rec2-sdb').name, 'current host, most free storage'
     FC::Storage.stubs(:curr_host).returns('rec3')
     @@storages[5].check_time = 0;
     @@storages[5].save
-    assert_equal 'rec3-sdb', @@policy.get_proper_storage_for_create(9, '/tmp/host3-sdc/test').name, 'current host, single storage'
+    assert_equal 'rec3-sdb', @@policy.get_proper_storage_for_create(9, 'test-rec2-sdb').name, 'current host, single storage'
     FC::Storage.stubs(:curr_host).returns('rec5')
-    assert_equal 'rec1-sda', @@policy.get_proper_storage_for_create(9, '/tmp/host3-sdc/test').name, 'not current host, most free storage'
-    assert_equal 'rec2-sdc', @@policy.get_proper_storage_for_create(10, '/tmp/host3-sdc/test').name, 'not current host, big file, most free storage with free space'
+    assert_equal 'rec1-sda', @@policy.get_proper_storage_for_create(9, 'test-rec2-sdb').name, 'not current host, most free storage'
+    assert_equal 'rec2-sdc', @@policy.get_proper_storage_for_create(10, 'test-rec2-sdb').name, 'not current host, big file, most free storage with free space'
+    File.unstub(:stat)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: filecluster
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-29 00:00:00.000000000 Z
+date: 2014-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -181,7 +181,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1129513891376945174
+      hash: 635343696830163722
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -190,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1129513891376945174
+      hash: 635343696830163722
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24