filecluster 0.5.7 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 513efeda9b8bc064c2ac65cff2b96f96ab3f2a13
-  data.tar.gz: a91430765fbf496273b7c25bed7c0f3fb1b89172
+  metadata.gz: fc12e92010113085a66dea7bfbac267f67768247
+  data.tar.gz: 80afdcb6ec68e4b282e359bd75cc46975787a22b
 SHA512:
-  metadata.gz: c452b42e5e0ef6ff4611b7d111a3b9f07ad351411636ebef0b50389463457a7d9796c3a104759da9d53bf66e48cb47ecde7ccc643cfb47303b9073fd5fd51416
-  data.tar.gz: 35a68af5f2165b48310777dcd9f1f5de141fee06e5625b1c77831859d6c07392879cd6f11f54e95489a5ffa0be80a1df3b0220919043a187fc112605d7d87c3c
+  metadata.gz: b67df5a734df911038c68f9b2780f355357adfec7865af7cacb55c661c09cb719dbec6f7d038d2cccb79dd9dee423391898efdcf9b98236cb6d2b0c01e46fd4e
+  data.tar.gz: 1d7eb36494a02a57c786da0a53c65bc60e280d13abd438e391384607a1f25951dc79584579d739d7d96a2c2a863ece8fa8d6dc7bc7dc639a7c5ac51cda9bbf37

data/lib/fc/storage.rb

@@ -16,7 +16,7 @@ module FC
     def self.curr_host
       @uname || @uname = `uname -n`.chomp
     end
-    
+
     def self.select_proper_storage_for_create(storages, size, exclude = [])
       list = storages.select do |storage|
         !exclude.include?(storage.name) && storage.up? && storage.size + size < storage.size_limit && storage.write_weight.to_i >= 0
@@ -101,23 +101,33 @@ module FC
     def up?
       check_time_delay < self.class.check_time_limit
     end
-    
+
+    def self.speed_limit_to_rsync_opt(speed_limit)
+      return "--bwlimit=#{(speed_limit.to_f * 125.0).ceil} " if speed_limit.to_f > 0
+      ''
+    end
+
     # copy local_path to storage
     def copy_path(local_path, file_name, try_move = false, speed_limit = nil)
       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 -q -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'
-      speed_limit = (speed_limit * 1000).to_i if speed_limit.to_f > 0
-      cmd = self.class.curr_host == host ?
-        "#{op} #{local_path.shellescape} #{dst_path.shellescape}" :
-        "scp -r -q -oBatchMode=yes -oStrictHostKeyChecking=no #{speed_limit.to_i > 0 ? '-l '+speed_limit.to_s : ''} #{local_path.shellescape} #{self.host}:\"#{dst_path.shellescape}\""
-      r = `#{cmd} 2>&1`
-      raise r if $?.exitstatus != 0
+      recreate_dirs_cmd = "rm -rf #{dst_path.shellescape}; mkdir -p #{File.dirname(dst_path).shellescape}"
+
+      # recreate dirs anyway if local op
+      if try_move && self.class.curr_host == host
+        r = `#{recreate_dirs_cmd} 2>&1`
+        raise r if $?.exitstatus != 0
+      end
+      # if we can make mv command
+      if try_move && self.class.curr_host == host && File.stat(local_path).dev == File.stat(File.dirname(dst_path)).dev
+        r = `mv #{local_path.shellescape} #{dst_path.shellescape} 2>&1`
+        raise r if $?.exitstatus != 0
+      else
+        local_path += '/' if File.stat(local_path).directory?
+        cmd = "ionice -c 2 -n 7 rsync -a #{FC::Storage.speed_limit_to_rsync_opt(speed_limit)}--rsync-path=\"#{recreate_dirs_cmd} && ionice -c 2 -n 7 rsync\" #{local_path.shellescape} #{self.host}:\"#{dst_path.shellescape}\""
+        r = `#{cmd} 2>&1`
+        raise r if $?.exitstatus != 0
+      end
     end
     
     # copy object to local_path
@@ -126,11 +136,13 @@ module FC
       
       r = `rm -rf #{local_path.shellescape}; mkdir -p #{File.dirname(local_path).shellescape} 2>&1`
       raise r if $?.exitstatus != 0
-      
-      speed_limit = (speed_limit * 1000).to_i if speed_limit.to_f > 0
-      cmd = self.class.curr_host == host ? 
-        "cp -r #{src_path.shellescape} #{local_path.shellescape}" : 
-        "scp -r -q -oBatchMode=yes -oStrictHostKeyChecking=no #{speed_limit.to_i > 0 ? '-l '+speed_limit.to_s : ''} #{self.host}:\"#{src_path.shellescape}\" #{local_path.shellescape}"
+
+      # if remote file is directory?
+      cmd = "ssh -oStrictHostKeyChecking=no -q #{self.host} \"if [ -d #{src_path.shellescape} ]; then /bin/true; else /bin/false; fi\""
+      r = `#{cmd} 2>&1`
+      src_path += '/' if $?.exitstatus == 0
+
+      cmd = "ionice -c 2 -n 7 rsync -a #{FC::Storage.speed_limit_to_rsync_opt(speed_limit)}--rsync-path=\"ionice -c 2 -n 7 rsync\" #{self.host}:\"#{src_path.shellescape}\" #{local_path.shellescape}"
       r = `#{cmd} 2>&1`
       raise r if $?.exitstatus != 0
     end

data/lib/fc/version.rb

@@ -1,3 +1,3 @@
 module FC
-  VERSION = '0.5.7'.freeze
+  VERSION = '0.5.8'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filecluster
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8
 platform: ruby
 authors:
 - sh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-25 00:00:00.000000000 Z
+date: 2017-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2