filecluster 0.0.6 → 0.0.7

data/bin/fc-setup-db

@@ -5,7 +5,7 @@ require 'optparse'
 require 'psych'
 require 'filecluster'
 require 'utils'
-require 'readline'
+require 'rb-readline'
 
 descriptions = {
   :host =>       {:short => 'h', :full => 'host',     :default => 'localhost', :text => 'mysql host name, default "localhost"', :save => true},

data/filecluster.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = FC::VERSION
   
-  gem.add_runtime_dependency "readline"
+  gem.add_runtime_dependency "rb-readline"
   
   gem.add_development_dependency "bundler"
   gem.add_development_dependency "test-unit"

data/lib/fc/item.rb

@@ -4,8 +4,10 @@ module FC
   class Item < DbBase
     set_table :items, 'name, tag, outer_id, policy_id, dir, size, status, time, copies'
     
-    # create item by local path 
-    # TODO проверка curr_host и local_path одному из доступных стораджей -> создание без копирования (для кусочков)
+    # Create item by local path.
+    # Additional options: 
+    #   :replace=true - replace item if it exists
+    # If item_name is part of local_path it prcessed 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)
       raise 'Policy is not FC::Policy' unless policy.instance_of?(FC::Policy)
@@ -16,9 +18,15 @@ module FC
         :size => `du -sb #{local_path}`.to_i
       })
       item_params.delete(:replace)
+      item_params.delete(:inplace)
       raise 'Name is empty' if item_params[:name].empty?
       raise 'Zero size path' if item_params[:size] == 0
       
+      if local_path.include?(item_name)
+        storage = policy.get_storages.detect{|s| local_path.index(s.path) == 0 && local_path.sub(s.path, '') == item_params[:name]}
+        FC::Error.raise "local_path #{local_path} is not valid path for policy ##{policy.id}" unless storage
+      end
+      
       # new item?
       item = FC::Item.where('name=? AND policy_id=?', item_params[:name], policy.id).first
       if item
@@ -35,11 +43,16 @@ module FC
       end
       item.save
       
-      storage = policy.get_proper_storage(item.size)
-      FC::Error.raise 'No available storage', :item_id => item.id unless storage
+      if storage
+        item_storage = item.make_item_storage(storage, 'ready')
+        item.reload
+      else 
+        storage = policy.get_proper_storage(item.size)
+        FC::Error.raise 'No available storage', :item_id => item.id unless storage
+        item_storage = item.make_item_storage(storage)
+        item.copy_item_storage(local_path, storage, item_storage)
+      end
       
-      item_storage = item.make_item_storage(storage)
-      item.copy_item_storage(local_path, storage, item_storage)
       return item
     end
     

data/lib/fc/policy.rb

@@ -4,8 +4,15 @@ module FC
   class Policy < DbBase
     set_table :policies, 'storages, copies'
     
+    class << self
+      attr_accessor :storages_cache_time
+    end
+    @storages_cache_time = 20 # ttl for storages cache
+    
     def get_storages
-      FC::Storage.where("name IN (#{storages.split(',').map{|s| "'#{s}'"}.join(',')})")
+      return @storages_cache if @storages_cache && Time.new.to_i - @get_storages_time.to_i < self.class.storages_cache_time
+      @get_storages_time = Time.new.to_i
+      @storages_cache = FC::Storage.where("name IN (#{storages.split(',').map{|s| "'#{s}'"}.join(',')})")
     end
     
     # get available storage for object by size

data/lib/fc/storage.rb

@@ -31,7 +31,7 @@ module FC
     end
     
     def up?
-      Time.new.to_i - check_time.to_i <= self.class.check_time_limit
+      Time.new.to_i - check_time.to_i < self.class.check_time_limit
     end
     
     # copy local_path to storage

data/lib/fc/version.rb

@@ -1,3 +1,3 @@
 module FC
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/manage.rb

@@ -1,4 +1,4 @@
-require 'readline'
+require 'rb-readline'
 require "manage/policies"
 require "manage/storages"
 require "manage/show"

data/test/functional_test.rb

@@ -94,4 +94,9 @@ class FunctionalTest < Test::Unit::TestCase
     assert_equal errors_count+1, FC::Error.where.count, "Error not saved after check size" 
   end
   
+  should "item create_from_local inplace" do
+    tmp_file_path = "/tmp/host2-sda/inplace_test"
+    `cp #{@@test_file_path} #{tmp_file_path}`
+    assert_nothing_raised { @item = FC::Item.create_from_local(tmp_file_path, 'inplace_test', @@policies[0]) }
+  end
 end

data/test/policy_test.rb

@@ -18,10 +18,18 @@ class PolicyTest < Test::Unit::TestCase
   end 
 
   should "get_storages" do
+    FC::Policy.storages_cache_time = 10
     assert_same_elements @@storages.map(&:id), @@policy.get_storages.map(&:id)
+    FC::Storage.new(:name => 'rec2-sdc', :host => 'rec2').save
+    @@policy.storages = 'rec1-sda,rec2-sda,rec2-sdc'
+    @@policy.save
+    assert_equal @@storages.size, @@policy.get_storages.size
+    FC::Policy.storages_cache_time = 0
+    assert_equal @@storages.size+1, @@policy.get_storages.size
   end
   
   should "get_proper_storage" do
+    FC::Policy.storages_cache_time = 0
     assert_nil @@policy.get_proper_storage(1), 'all storages down'
     @@storages[0].update_check_time
     assert_equal @@storages[0].id, @@policy.get_proper_storage(1).id, 'first storages up'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: filecluster
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,10 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-12 00:00:00.000000000 Z
+date: 2013-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: readline
+  name: rb-readline
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -184,12 +184,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2060100301757257231
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2060100301757257231
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24