filecluster 0.1.1 → 0.1.2

data/TODO

@@ -1,3 +1,4 @@
+! что делать с error is?
 периодически удалять пустые папки
 при создании item-а по папке проверять что папка не пустая
 проработать item-ы папки

data/lib/fc/base.rb

@@ -54,6 +54,8 @@ module FC
       self.class.table_fields.each do |key|
         db_val = @database_fields[key]
         val = self.send(key)
+        val = 1 if val == true
+        val = 0 if val == false
         if val.to_s != db_val.to_s || val.nil? && !db_val.nil? || !val.nil? && db_val.nil?
           fields << "#{key}=#{val ? (val.class == String ? "'#{FC::DB.connect.escape(val)}'" : val.to_i) : 'NULL'}"
         end

data/lib/fc/storage.rb

@@ -40,11 +40,15 @@ module FC
     def copy_path(local_path, file_name)
       dst_path = "#{self.path}#{file_name}"
       
-      cmd = self.class.curr_host == host ? "mkdir -p #{File.dirname(dst_path)}" : "ssh -oBatchMode=yes #{self.host} 'mkdir -p #{File.dirname(dst_path)}'"
+      cmd = self.class.curr_host == host ? 
+        "mkdir -p #{File.dirname(dst_path)}" : 
+        "ssh -oBatchMode=yes -oStrictHostKeyChecking=no #{self.host} 'mkdir -p #{File.dirname(dst_path)}'"
       r = `#{cmd} 2>&1`
       raise r if $?.exitstatus != 0
       
-      cmd = self.class.curr_host == host ? "cp -r #{local_path} #{dst_path}" : "scp -rB #{local_path} #{self.host}:#{dst_path}"
+      cmd = self.class.curr_host == host ? 
+        "cp -r #{local_path} #{dst_path}" : 
+        "scp -rB #{local_path} #{self.host}:#{dst_path}"
       r = `#{cmd} 2>&1`
       raise r if $?.exitstatus != 0
     end
@@ -56,7 +60,9 @@ module FC
       r = `mkdir -p #{File.dirname(local_path)} 2>&1`
       raise r if $?.exitstatus != 0
       
-      cmd = self.class.curr_host == host ? "cp -r #{src_path} #{local_path}" : "scp -rB #{self.host}:#{src_path} #{local_path}"
+      cmd = self.class.curr_host == host ? 
+        "cp -r #{src_path} #{local_path}" : 
+        "scp -rB #{self.host}:#{src_path} #{local_path}"
       r = `#{cmd} 2>&1`
       raise r if $?.exitstatus != 0
     end
@@ -64,11 +70,15 @@ module FC
     # delete object from storage
     def delete_file(file_name)
       dst_path = "#{self.path}#{file_name}"
-      cmd = self.class.curr_host == host ? "rm -rf #{dst_path}" : "ssh -oBatchMode=yes #{self.host} 'rm -rf #{dst_path}'"
+      cmd = self.class.curr_host == host ? 
+        "rm -rf #{dst_path}" : 
+        "ssh -oBatchMode=yes -oStrictHostKeyChecking=no #{self.host} 'rm -rf #{dst_path}'"
       r = `#{cmd} 2>&1`
       raise r if $?.exitstatus != 0
       
-      cmd = self.class.curr_host == host ? "ls -la #{dst_path}" : "ssh -oBatchMode=yes #{self.host} 'ls -la #{dst_path}'"
+      cmd = self.class.curr_host == host ? 
+        "ls -la #{dst_path}" : 
+        "ssh -oBatchMode=yes -oStrictHostKeyChecking=no #{self.host} 'ls -la #{dst_path}'"
       r = `#{cmd} 2>/dev/null`
       raise "Path #{dst_path} not deleted" unless r.empty?
     end
@@ -77,7 +87,9 @@ module FC
     def file_size(file_name)
       dst_path = "#{self.path}#{file_name}"
       
-      cmd = self.class.curr_host == host ? "du -sb #{dst_path}" : "ssh -oBatchMode=yes #{self.host} 'du -sb #{dst_path}'"
+      cmd = self.class.curr_host == host ? 
+        "du -sb #{dst_path}" : 
+        "ssh -oBatchMode=yes -oStrictHostKeyChecking=no #{self.host} 'du -sb #{dst_path}'"
       r = `#{cmd} 2>&1`
       raise r if $?.exitstatus != 0
       r.to_i

data/lib/fc/version.rb

@@ -1,3 +1,3 @@
 module FC
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/manage/show.rb

@@ -50,6 +50,11 @@ def show_items_info
   counts.each do |r|
     puts "   #{r['status']}: #{r['cnt']}"
   end
+  puts "Items storages by status:"
+  counts = FC::DB.connect.query("SELECT status, count(*) as cnt FROM #{FC::ItemStorage.table_name} WHERE 1 GROUP BY status")
+  counts.each do |r|
+    puts "   #{r['status']}: #{r['cnt']}"
+  end
   count = FC::DB.connect.query("SELECT count(*) as cnt FROM #{FC::Item.table_name} as i, #{FC::Policy.table_name} as p WHERE i.policy_id = p.id AND i.copies > 0 AND i.copies < p.copies AND i.status = 'ready'").first['cnt']
   puts "Items to copy: #{count}"
   count = FC::DB.connect.query("SELECT count(*) as cnt FROM #{FC::Item.table_name} as i, #{FC::Policy.table_name} as p WHERE i.policy_id = p.id AND i.copies > p.copies AND i.status = 'ready'").first['cnt']

data/test/daemon_test.rb

@@ -32,9 +32,13 @@ class DaemonTest < Test::Unit::TestCase
       `rm -rf /tmp/host*-sd*`
       `mkdir -p /tmp/host1-sda/ /tmp/host1-sdb/ /tmp/host1-sdc/`
       
-      # test file to copy
+      # test files to copy
       @@test_file_path = '/tmp/fc_test_file'
       `dd if=/dev/urandom of=#{@@test_file_path} bs=1M count=1 2>&1`
+      @@test_dir_path = '/tmp/fc_test_dir'
+      `mkdir -p #{@@test_dir_path}/aaa #{@@test_dir_path}/bbb`
+      `cp #{@@test_file_path} #{@@test_dir_path}/aaa/test1`
+      `cp #{@@test_file_path} #{@@test_dir_path}/bbb/test2`
       
       @@storages = []
       @@storages << FC::Storage.new(:name => 'host1-sda', :host => 'host1', :path => '/tmp/host1-sda/', :copy_id => 1, :size_limit => 1000000000)
@@ -59,7 +63,9 @@ class DaemonTest < Test::Unit::TestCase
       FC::DB.connect.query("DELETE FROM items")
       FC::DB.connect.query("DELETE FROM policies")
       FC::DB.connect.query("DELETE FROM storages")
-      `rm -rf /tmp/host1-sda /tmp/host1-sdb /tmp/host1-sdc`
+      `rm -rf /tmp/host*-sd*`
+      `rm -rf #{@@test_file_path}`
+      `rm -rf #{@@test_dir_path}`
     end
   end
   
@@ -72,7 +78,7 @@ class DaemonTest < Test::Unit::TestCase
     FC::Storage.stubs(:curr_host).returns('host1')
     assert_nothing_raised { @item1 = FC::Item.create_from_local(@@test_file_path, 'bla/bla/test1', @@policy, {:tag => 'test1'}) }
     assert_nothing_raised { @item2 = FC::Item.create_from_local(@@test_file_path, 'bla/bla/test2', @@policy, {:tag => 'test2'}) }
-    assert_nothing_raised { @item3 = FC::Item.create_from_local(@@test_file_path, 'bla/bla/test3', @@policy, {:tag => 'test3'}) }
+    assert_nothing_raised { @item3 = FC::Item.create_from_local(@@test_dir_path, 'bla/bla/test3', @@policy, {:tag => 'test3'}) }
     
     @@policy.copies = 3
     @@policy.save
@@ -81,7 +87,7 @@ class DaemonTest < Test::Unit::TestCase
     # wait for copy
     [1, 2, 3].each do |i|
       ['b', 'c'].each do |j|
-        assert_equal `du -b /tmp/host1-sda/bla/bla/test$i 2>&1`.to_i, `du -b /tmp/host$i-sd$j/bla/bla/test$i 2>&1`.to_i
+        assert_equal `du -sb /tmp/host1-sda/bla/bla/test$i 2>&1`.to_i, `du -sb /tmp/host$i-sd$j/bla/bla/test$i 2>&1`.to_i
       end
     end
         
@@ -91,7 +97,7 @@ class DaemonTest < Test::Unit::TestCase
     item_storage.status = 'delete'
     item_storage.save
     sleep 2
-    assert_equal 0, `du -b /tmp/host1-sdc/bla/bla/test1 2>&1`.to_i
+    assert_equal 0, `du -sb /tmp/host1-sdc/bla/bla/test1 2>&1`.to_i
     
     assert_equal @@errors_count, FC::Error.where.count, "new errors in errors table"
   end

data/test/functional_test.rb

@@ -6,10 +6,16 @@ class FunctionalTest < Test::Unit::TestCase
       # tmp fake storages dirs
       `rm -rf /tmp/host*-sd*`
       `mkdir -p /tmp/host1-sda/ /tmp/host2-sda/`
+      `rm -rf /tmp/fc_test_dir`
+      `mkdir -p /tmp/fc_test_dir`
       
       # test file to copy
       @@test_file_path = '/tmp/fc_test_file'
       `dd if=/dev/urandom of=#{@@test_file_path} bs=100K count=1 2>&1`
+      @@test_dir_path = '/tmp/fc_test_dir'
+      `mkdir -p #{@@test_dir_path}/aaa #{@@test_dir_path}/bbb`
+      `cp #{@@test_file_path} #{@@test_dir_path}/aaa/test1`
+      `cp #{@@test_file_path} #{@@test_dir_path}/bbb/test2`
       
       @@storages = []
       @@storages << FC::Storage.new(:name => 'host1-sda', :host => 'host1', :path => '/tmp/host1-sda/', :size_limit => 1000000, :check_time => Time.new.to_i)
@@ -31,7 +37,9 @@ class FunctionalTest < Test::Unit::TestCase
       FC::DB.connect.query("DELETE FROM items")
       FC::DB.connect.query("DELETE FROM policies")
       FC::DB.connect.query("DELETE FROM storages")
-      `rm -rf /tmp/host1-sda /tmp/host2-sda`
+      `rm -rf /tmp/host*-sd*`
+      `rm -rf #{@@test_file_path}`
+      `rm -rf #{@@test_dir_path}`
     end
   end
   
@@ -43,8 +51,22 @@ class FunctionalTest < Test::Unit::TestCase
   should "item create_from_local successful" do
     assert_nothing_raised { @item = FC::Item.create_from_local(@@test_file_path, '/bla/bla/test1', @@policies[0], {:tag => 'test'}) }
     assert_kind_of FC::Item, @item
-    assert_equal `du -b /tmp/host1-sda/bla/bla/test1 2>&1`.to_i, `du -b #{@@test_file_path} 2>&1`.to_i
-    assert_equal `du -b /tmp/host1-sda/bla/bla/test1 2>&1`.to_i, @item.size
+    assert_equal `du -sb /tmp/host1-sda/bla/bla/test1 2>&1`.to_i, `du -sb #{@@test_file_path} 2>&1`.to_i
+    assert_equal `du -sb /tmp/host1-sda/bla/bla/test1 2>&1`.to_i, @item.size
+    assert_equal 'ready', @item.status
+    item_storages = @item.get_item_storages
+    assert_equal 1, item_storages.count
+    item_storage = item_storages.first
+    assert_equal 'ready', item_storage.status
+    assert_equal 'host1-sda', item_storage.storage_name
+  end
+  
+  should "item create_from_local dir successful" do
+    assert_nothing_raised { @item = FC::Item.create_from_local(@@test_dir_path, '/bla/bla/test_dir', @@policies[0], {:tag => 'test_dir'}) }
+    assert_kind_of FC::Item, @item
+    assert_equal true, @item.dir?
+    assert_equal `du -sb /tmp/host1-sda/bla/bla/test_dir 2>&1`.to_i, `du -sb #{@@test_dir_path} 2>&1`.to_i
+    assert_equal `du -sb /tmp/host1-sda/bla/bla/test_dir 2>&1`.to_i, @item.size
     assert_equal 'ready', @item.status
     item_storages = @item.get_item_storages
     assert_equal 1, item_storages.count

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: filecluster
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-17 00:00:00.000000000 Z
+date: 2013-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb-readline
@@ -186,7 +186,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4000916111344436581
+      hash: 2481106043269937193
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -195,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4000916111344436581
+      hash: 2481106043269937193
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24