filecluster 0.4.15 → 0.4.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b860fb1f75b6844222f4335a3e7f3088518fa4d2
-  data.tar.gz: feefd623d4cf79f93672c5fbde5208704466767a
+  metadata.gz: 8a77a589e905d57361c53d461dac5bbdffcf5b15
+  data.tar.gz: de91ef4e8a99f6124a24b72d0f4b63c428cd2286
 SHA512:
-  metadata.gz: 321930084012bda837973fc91a217e37648e0d97a909627a03288933f0c81ffde1349959e9ce3ecebee9df9542596e5ad13bbc625037012288bb5b92124ae39b
-  data.tar.gz: 4a1e444e9e8de32df3355c135378659ebfed7c4fd2365790032866b6c723b932bb4c3e4e289c53f746d42faa081a27db83ade49ad7f7f38f1d7cf74de003e89e
+  metadata.gz: 1e5e4519345081eca7d9b6fd704d65f185fb01e95bdf5d9a381430ffc8cf44afb5f6e96165cf3cb27543b1450b8d79e320e0d11f2ab0d40df4b61ad69c92eaf9
+  data.tar.gz: 36940d94c87ddf6c69b5875df1d5d12d66c5ce02f502f1aea8c9a43f068ff0f3ad6167f53be9d6ec765175edc91b73830b880d2bff226eb5707358db3c7e2366

data/lib/daemon/update_tasks_thread.rb

@@ -11,7 +11,7 @@ class UpdateTasksThread < BaseThread
     tasks = (type == :copy ? $tasks_copy : $tasks_delete) 
     $storages.each do |storage|
       tasks[storage.name] = [] unless tasks[storage.name]
-      ids = tasks[storage.name].map(&:id) + $curr_tasks.map(&:id)
+      ids = tasks[storage.name].map(&:id) + $curr_tasks.compact.map(&:id)
       if ids.length > limit*2
         $log.debug("Too many (#{ids.length}) #{type} tasks")
         next

data/lib/fc/db.rb

@@ -275,5 +275,9 @@ module FC
       FC::DB.query("ALTER TABLE #{@prefix}storages ADD COLUMN write_weight int NOT NULL DEFAULT 0")
       FC::DB.query("INSERT INTO #{@prefix}vars SET name='daemon_copy_speed_per_host_limit', val='', descr='copy tasks speed limit for hosts, change via fc-manage copy_speed'")
     end
+    
+    def self.migrate_2
+      FC::DB.query("ALTER TABLE #{@prefix}storages ADD COLUMN dc varchar(255) DEFAULT ''")
+    end
   end
 end

data/lib/fc/storage.rb

@@ -4,7 +4,7 @@ require 'fileutils'
 
 module FC
   class Storage < DbBase
-    set_table :storages, 'name, host, path, url, size, size_limit, check_time, copy_storages, url_weight, write_weight'
+    set_table :storages, 'name, host, dc, path, url, size, size_limit, check_time, copy_storages, url_weight, write_weight'
     
     class << self
       attr_accessor :check_time_limit, :storages_cache_time, :get_copy_storages_mutex

data/lib/fc/version.rb

@@ -1,3 +1,3 @@
 module FC
-  VERSION = "0.4.15"
+  VERSION = "0.4.16"
 end

data/lib/manage/storages.rb

@@ -7,7 +7,7 @@ def storages_list
     puts "No storages."
   else
     storages.each do |storage|
-      str = "#{colorize_string(storage.host, :yellow)} #{storage.name} #{size_to_human(storage.size)}/#{size_to_human(storage.size_limit)} "
+      str = " #{colorize_string(storage.dc, :blue)}\t#{colorize_string(storage.host, :yellow)} #{storage.name} #{size_to_human(storage.size)}/#{size_to_human(storage.size_limit)} "
       str += "#{(storage.free_rate*100).to_i}% free "
       str += "#{storage.up? ? colorize_string('UP', :green) : colorize_string('DOWN', :red)}"
       str += " #{storage.check_time_delay} seconds ago" if storage.check_time
@@ -22,6 +22,7 @@ def storages_show
     puts %Q{Storage
   Name:           #{storage.name}
   Host:           #{storage.host} 
+  DC:             #{storage.dc}
   Path:           #{storage.path} 
   Url:            #{storage.url}
   Url weight:     #{storage.url_weight}
@@ -40,6 +41,7 @@ def storages_add
   host = FC::Storage.curr_host
   puts "Add storage to host #{host}"
   name = stdin_read_val('Name')
+  dc = stdin_read_val('DC')
   path = stdin_read_val('Path')
   url = stdin_read_val('Url')
   url_weight = stdin_read_val('URL weight', true).to_i
@@ -51,7 +53,7 @@ def storages_add
   begin
     path = path +'/' unless path[-1] == '/'
     path = '/' + path unless path[0] == '/'
-    storage = FC::Storage.new(:name => name, :host => host, :path => path, :url => url, :size_limit => size_limit, :copy_storages => copy_storages, :url_weight => url_weight, :write_weight => write_weight)
+    storage = FC::Storage.new(:name => name, :dc => dc, :host => host, :path => path, :url => url, :size_limit => size_limit, :copy_storages => copy_storages, :url_weight => url_weight, :write_weight => write_weight)
     print "Calc current size.. "
     size = storage.file_size('', true)
     puts "ok"
@@ -62,6 +64,7 @@ def storages_add
   free = size_limit - size
   puts %Q{\nStorage
   Name:         #{name}
+  DC:           #{dc}
   Host:         #{host} 
   Path:         #{path} 
   Url:          #{url}
@@ -120,6 +123,7 @@ end
 def storages_change
   if storage = find_storage
     puts "Change storage #{storage.name}"
+    dc = stdin_read_val("DC (now #{storage.dc})", true)
     host = stdin_read_val("Host (now #{storage.host})", true)
     path = stdin_read_val("Path (now #{storage.path})", true)
     url = stdin_read_val("Url (now #{storage.url})", true)
@@ -128,6 +132,7 @@ def storages_change
     size_limit = stdin_read_val("Size (now #{size_to_human(storage.size_limit)})", true) {|val| "Size limit not is valid size." if !val.empty? && !human_to_size(val)}
     copy_storages = stdin_read_val("Copy storages (now #{storage.copy_storages})", true)
     
+    storage.dc = dc unless dc.empty?
     storage.host = host unless host.empty?
     if !path.empty? && path != storage.path
       path = path +'/' unless path[-1] == '/'
@@ -146,6 +151,7 @@ def storages_change
     
     puts %Q{\nStorage
     Name:          #{storage.name}
+    DC:            #{storage.dc}
     Host:          #{storage.host} 
     Path:          #{storage.path} 
     Url:           #{storage.url}

data/lib/utils.rb

@@ -74,6 +74,8 @@ def colorize_string(str, color)
     color_code = 32
   when 'yellow'
     color_code = 33
+  when 'blue'
+    color_code = 34
   when 'pink'
     color_code = 35
   else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filecluster
 version: !ruby/object:Gem::Version
-  version: 0.4.15
+  version: 0.4.16
 platform: ruby
 authors:
 - sh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-25 00:00:00.000000000 Z
+date: 2015-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2