roma 0.8.12 → 0.8.13p1

data/ruby/server/lib/roma/routing/cb_rttable.rb

@@ -14,7 +14,11 @@ module Roma
       attr :trans # transaction
       attr :leave_proc
       attr :lost_proc
+      attr :recover_proc
       attr_accessor :lost_action
+      attr_accessor :auto_recover
+      attr_accessor :auto_recover_status
+      attr_accessor :auto_recover_time
       attr_reader :version_of_nodes
       attr_reader :min_version
 
@@ -25,7 +29,11 @@ module Roma
         @fname=fname
         @leave_proc=nil
         @lost_proc=nil
+        @recover_proc=nil
         @lost_action=:no_action
+        @auto_recover=false
+        @auto_recover_status="waiting"
+        @auto_recover_time=1800
         @enabled_failover=false
         @lock = Mutex.new
         @version_of_nodes = Hash.new(0)
@@ -36,6 +44,9 @@ module Roma
       def get_stat(ap)
         ret = super(ap)
         ret['routing.lost_action'] = @lost_action.to_s
+        ret['routing.auto_recover'] = @auto_recover.to_s
+        ret['routing.auto_recover_status'] = @auto_recover_status.to_s
+        ret['routing.auto_recover_time'] = @auto_recover_time
         ret['routing.version_of_nodes'] = @version_of_nodes.inspect
         ret['routing.min_version'] = @min_version
         ret
@@ -60,6 +71,10 @@ module Roma
         @lost_proc=block        
       end
 
+      def set_recover_proc(&block)
+        @recover_proc=block
+      end
+
       def open_log
         log_list=@rd.get_file_list(@fname)
         if log_list.length==0
@@ -217,6 +232,7 @@ module Roma
         write_log("leave #{nid}")
         
         lost_vnodes=[]
+        short_vnodes=[]
         @lock.synchronize {
           @rd.v_idx.each_pair{ |vn, nids|
             buf = nids.clone
@@ -225,7 +241,9 @@ module Roma
               if buf.length == 0
                 lost_vnodes << vn
                 @log.error("Vnode data is lost.(Vnode=#{vn})")
-               end
+              elsif buf.length < @rd.rn
+                short_vnodes << vn
+              end
             end
           }
         }
@@ -236,6 +254,9 @@ module Roma
               set_route_and_inc_clk_inside_sync( vn, next_alive_vnode(vn) )
             }
           end
+        elsif short_vnodes.length > 0
+          @log.error("Short vnodes exist.")
+          @recover_proc.call('start_auto_recover_process') if @recover_proc
         end
         @fail_cnt.delete(nid)
       end

data/ruby/server/lib/roma/routing/random_balancer.rb

@@ -0,0 +1,76 @@
+module Roma
+  module Routing
+    module RandomBalancer
+
+      # The randomly selected +from+'s vertual-node changes to +to+.
+      # +idx+:: As for 0 is primary, 1 or more are secondary.
+      def randomly_change_nid!(idx, from, to, repethost = false)
+        vns = []
+        v_idx.each_pair do |vn, nids|
+          cnt = 0
+          nids.each_with_index do |nid, i|
+            if idx == i
+              cnt += 1 if nid == from
+            else
+              if repethost == true
+                cnt += 1 if nid != to
+              else
+                cnt += 1 if nid.split('_')[0] != to.split('_')[0]
+              end
+            end
+          end
+          vns << vn if cnt == nids.length
+        end
+        return nil if vns.length == 0
+        vn = vns[rand(vns.length)]
+        #puts "#{vn} #{v_idx[vn]}"
+        v_idx[vn][idx] = to
+        #puts "#{vn} #{v_idx[vn]}"
+        vn
+      end
+
+      # Returns min/max values and correspondent node-id of the histgram.
+      # +idx+:: As for 0 is primary, 1 or more are secondary.
+      def get_min_max_histgram(idx)
+        h = get_histgram
+        min_nid = max_nid = nil
+        min = v_idx.length
+        max = 0
+        h.each do |nid, v|
+          if v[idx] < min
+            min = v[idx]
+            min_nid = nid
+          end
+          if v[idx] > max
+            max = v[idx]
+            max_nid = nid
+          end
+        end
+        [min, min_nid, max, max_nid]
+      end
+      
+      # Returns a replacement list for balanced routing.
+      def get_balanced_vn_replacement_list(repethost = false)
+        rd = clone
+        ret = []
+        @rn.times do |idx| # primary, secondary1, ...
+          loop do # until balanced
+            min, min_nid, max, max_nid = rd.get_min_max_histgram(idx)
+            break if max - min < 2 || min_nid == max_nid
+            vn = rd.randomly_change_nid!(idx, max_nid, min_nid, repethost)
+            return nil unless vn # error
+            ret << {:vn=>vn, :idx=>idx, :from=>max_nid, :to=>min_nid}
+          end
+        end
+        ret
+      end
+      
+      def balance!(vn_replacement_list, repethost = false)
+        vn_replacement_list.each do |rep|
+          v_idx[rep[:vn]][rep[:idx]] = rep[:to]
+        end
+      end
+
+    end # module RandomBalancer
+  end
+end

data/ruby/server/lib/roma/routing/routing_data.rb

@@ -1,9 +1,13 @@
 require 'yaml'
+require 'roma/routing/random_balancer'
 
 module Roma
   module Routing
 
     class RoutingData
+
+      include Routing::RandomBalancer
+
       attr_accessor :dgst_bits
       attr_accessor :div_bits
       attr_accessor :rn
@@ -88,6 +92,11 @@ module Roma
         rd
       end
 
+      # for deep copy
+      def clone
+        Marshal.load(Marshal.dump(self))
+      end
+ 
       # 2 bytes('RT'):magic code
       # unsigned short:format version
       # unsigned char:dgst_bits
@@ -210,11 +219,16 @@ module Roma
 
         rnlm=RandomNodeListMaker.new(nodes,repethost)
 
-        (2**div_bits).times{|i|
+        (2**div_bits).times do |i|
           vn=i<<(dgst_bits-div_bits)
           ret.v_clk[vn]=0
           ret.v_idx[vn]=rnlm.list(rn)
-        }
+        end
+
+        # vnode balanceing process
+        rlist = ret.get_balanced_vn_replacement_list(repethost)
+        ret.balance!(rlist, repethost) if rlist
+
         ret
       end
 

data/ruby/server/lib/roma/routing/rttable.rb

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 require 'roma/logging/rlogger'
 require 'roma/routing/routing_data'
 require 'roma/routing/merkle_tree'
@@ -19,6 +18,7 @@ module Roma
       attr_reader :div_bits
       attr_accessor :fail_cnt_threshold
       attr_accessor :fail_cnt_gap
+      attr_accessor :sub_nid
 
       def initialize(rd)
         @log = Roma::Logging::RLogger.instance
@@ -31,6 +31,7 @@ module Roma
         @fail_cnt_threshold = 5
         @fail_cnt_gap = 0
         @fail_time = Time.now
+        @sub_nid = {}
         init_mtree
       end
 
@@ -46,7 +47,7 @@ module Roma
           elsif nids.include?(ap)
             sn += 1
           end
-          short += 1 if nids.length < @rd.rn 
+          short += 1 if nids.length < @rd.rn
         }
 
         ret = {}
@@ -62,6 +63,7 @@ module Roma
         ret['routing.lost_vnodes'] = lost
         ret['routing.fail_cnt_threshold'] = @fail_cnt_threshold
         ret['routing.fail_cnt_gap'] = @fail_cnt_gap
+        ret['routing.sub_nid'] = @sub_nid.inspect
         ret
       end
 
@@ -80,12 +82,12 @@ module Roma
         @rd.v_idx.keys
       end
 
-      # ハッシュ値からvnode idを返す
+      # get vnode id from hash value
       def get_vnode_id(d)
         d & @search_mask
       end
 
-      # vnode があるノードIDの配列を返す
+      # get array of node ID which have vnode
       # +vn+: vnode id
       def search_nodes(vn)
         @rd.v_idx[vn].clone
@@ -93,11 +95,11 @@ module Roma
         nil
       end
 
-      # 離脱ノードを検索リストから削除する
-      # +nid+: 離脱ノード
+      # delete dropping node from list
+      # +nid+: dropping node
       def leave(nid)
         @rd.nodes.delete(nid)
-        # リストから nid を消す
+        # delet nid from list
         @rd.v_idx.each_pair{ |vn, nids|
           nids.delete_if{ |nid2| nid2 == nid}
           if nids.length == 0
@@ -141,11 +143,56 @@ module Roma
         @fail_cnt.delete(nid)
       end
 
-      # v_idx から nodes を再構築する
+      # Reconstruct vnodes from v_idx
       def create_nodes_from_v_idx
         @rd.create_nodes_from_v_idx
       end
 
+      # Returns a new RoutingData object which replaced host name by the sub_nid attribute.
+      def sub_nid_rd(addr)
+        sub_nid.each do |mask, sub|
+          if check_netmask?(addr, mask)
+            return get_replaced_rd(sub[:regexp], sub[:replace])
+          end
+        end
+        nil
+      end
+
+      private
+
+      def get_replaced_rd(regxp, replace)
+        rd = Marshal.load(dump)
+        
+        rd.nodes.map! do |nid|
+          nid.sub(regxp, replace)
+        end
+
+        rd.v_idx.each_value do |nids|
+          nids.map! do |nid|
+            nid.sub(regxp, replace)
+          end
+        end
+        rd
+      end
+      
+      def check_netmask?(addr, mask)
+        if addr =~ /(\d+)\.(\d+)\.(\d+)\.(\d+)/
+          iaddr = ($1.to_i  << 24) + ($2.to_i << 16) + ($3.to_i << 8) + $4.to_i
+        else
+          @log.error("#{__method__}:Illigal format addr #{addr}")
+          return false
+        end
+
+        if mask =~ /(\d+)\.(\d+)\.(\d+)\.(\d+)\/(\d+)/
+          imask_addr = ($1.to_i  << 24) + ($2.to_i << 16) + ($3.to_i << 8) + $4.to_i
+          imask = (2 ** $5.to_i - 1) << (32 - $5.to_i)
+        else
+          @log.error("#{__method__}:Illigal format mask #{mask}")
+          return false
+        end
+        (iaddr & imask) == (imask_addr & imask)
+      end
+      
     end # class RoutingTable
 
   end # module Routing

data/ruby/server/lib/roma/stats.rb

@@ -56,6 +56,21 @@ module Roma
     # for write behind
     attr_accessor :wb_command_map
 
+    # for latency average check
+    attr_accessor :latency_log
+    attr_accessor :latency_check_cmd
+    attr_accessor :latency_check_time_count
+    attr_accessor :latency_data
+    #attr_accessor :latency_denominator
+
+    # for vnode copy parameter
+    attr_accessor :spushv_klength_warn
+    attr_accessor :spushv_vlength_warn
+    attr_accessor :spushv_read_timeout
+    attr_accessor :reqpushv_timeout_count
+
+    attr_accessor :routing_trans_timeout
+
     def initialize
       @config_path = nil
       @run_recover = false
@@ -81,6 +96,15 @@ module Roma
       @size_of_zredundant = 0
       @hilatency_warn_time = 5
       @wb_command_map = {}
+      @latency_log = false
+      @latency_check_cmd =["get", "set", "delete"]
+      @latency_check_time_count = nil
+      @latency_data = Hash.new { |hash,key| hash[key] = {} } #double hash
+      @spushv_klength_warn = 1024 # 1kB
+      @spushv_vlength_warn = 1024 * 1024 # 1MB
+      @spushv_read_timeout = 100
+      @reqpushv_timeout_count = 300 # 0.1 * 300 sec
+      @routing_trans_timeout = 3600 * 3 # 3hr
     end
 
     def ap_str
@@ -118,6 +142,14 @@ module Roma
       ret['stats.redundant_count'] = @redundant_count
       ret['stats.hilatency_warn_time'] = @hilatency_warn_time
       ret['stats.wb_command_map'] = @wb_command_map.inspect
+      ret['stats.latency_log']  = @latency_log
+      ret['stats.latency_check_cmd']  = @latency_check_cmd
+      ret['stats.latency_check_time_count']  = @latency_check_time_count
+      ret['stats.spushv_klength_warn'] = @spushv_klength_warn
+      ret['stats.spushv_vlength_warn'] = @spushv_vlength_warn
+      ret['stats.spushv_read_timeout'] = @spushv_read_timeout
+      ret['stats.reqpushv_timeout_count'] = @reqpushv_timeout_count
+      ret['stats.routing_trans_timeout'] = @routing_trans_timeout
       ret
     end
 

data/ruby/server/lib/roma/storage/sqlite3_storage.rb

@@ -6,7 +6,9 @@ module Roma
 
     module SQLite3_Ext
       def put(k,v)
-        k = k.encode("ascii-8bit") if RUBY_VERSION >= "1.9.3"
+        if RUBY_VERSION >= "1.9.1"
+          k = k.encode("ascii-8bit") if k.encoding != Encoding::ASCII_8BIT
+        end
         if self.execute("select count(*) from t_roma where key=?",k)[0][0].to_i==0
           self.execute("insert into t_roma values (?,?)",k,SQLite3::Blob.new(v))
         else
@@ -15,14 +17,18 @@ module Roma
       end
 
       def get(k)
-        k = k.encode("ascii-8bit") if RUBY_VERSION >= "1.9.3"
+        if RUBY_VERSION >= "1.9.1"
+          k = k.encode("ascii-8bit") if k.encoding != Encoding::ASCII_8BIT
+        end
         r = self.execute("select * from t_roma where key=?",k)
         return nil if r.length==0
         r[0][1]
       end
 
       def out(k)
-        k = k.encode("ascii-8bit") if RUBY_VERSION >= "1.9.3"
+        if RUBY_VERSION >= "1.9.1"
+          k = k.encode("ascii-8bit") if k.encoding != Encoding::ASCII_8BIT
+        end
         return nil if get(k) == nil
         self.execute("delete from t_roma where key=?",k)
       end