roma 1.1.0 → 1.2.0

data/lib/roma/command/sys_command_receiver.rb

@@ -39,19 +39,58 @@ module Roma
         @stop_event_loop = true
       end
 
-      # shutdown_instance [node-id]
-      def ev_shutdown_instance(s)
-        if s.length != 2
-          send_data("usage:shutdown_instance [node-id]\r\n")
+      # shutdown [reason]
+      def ev_shutdown(s)
+        send_data("*** ARE YOU REALLY SURE TO SHUTDOWN? *** (yes/no)\r\n")
+        if gets != "yes\r\n"
+          close_connection_after_writing
+          return
+        end
+
+        if s.length == 2
+          @log.info("Receive a shutdown #{s[1]}")
+        else
+          @log.info("Receive a shutdown command.")
+        end
+        @rttable.enabled_failover = false
+        res = broadcast_cmd("rshutdown\r\n")
+        res[@stats.ap_str] = "BYE"
+        send_data("#{res.inspect}\r\n")
+        close_connection_after_writing
+        @stop_event_loop = true
+      end
+
+      # rshutdown [reason]
+      def ev_rshutdown(s)
+        if s.length == 2
+          @log.info("Receive a rshutdown #{s[1]}")
         else
-          if s[1] == @stats.ap_str
-            @rttable.enabled_failover = false
-            send_data("BYE\r\n")
-            @stop_event_loop = true
+          @log.info("Receive a rshutdown command.")
+        end
+        @rttable.enabled_failover = false
+        send_data("BYE\r\n")
+        close_connection_after_writing
+        @stop_event_loop = true
+      end
+
+      # shutdown_self
+      def ev_shutdown_self(s)
+        if s.length != 1
+          send_data("ERROR: shutdown_instance has irregular argument.\r\n")
+        else
+          send_data("\r\n=================================================================\r\n")
+          send_data("CAUTION!!: \r\n\tThis command kill the instance!\r\n\tThere is some possibility of occuring redundancy down!\r\n")
+          send_data("=================================================================\r\n")
+          send_data("\r\nAre you sure to shutdown this instance?(yes/no)\r\n")
+          if gets != "yes\r\n"
             close_connection_after_writing
-          else
-            send_data("invalid [node-id]\r\n")
+            return
           end
+          @log.info("Receive a shutdown_self command.")
+          @rttable.enabled_failover = false
+          send_data("BYE\r\n")
+          @stop_event_loop = true
+          close_connection_after_writing
         end
       end
 
@@ -243,6 +282,9 @@ module Roma
         else
           return send_data("CLIENT_ERROR no match log-level string\r\n")
         end
+
+        @stats.log_level = s[1].downcase
+
         send_data("STORED\r\n")
       end
 

data/lib/roma/config.rb

@@ -3,6 +3,9 @@ require 'roma/storage/rh_storage'
 module Roma
   
   module Config
+    # check when the booting
+    VERSION = "1.2.0"
+
     DEFAULT_PORT = 12000
     DEFAULT_NAME = 'ROMA'
 

data/lib/roma/event/handler.rb

@@ -3,6 +3,8 @@
 #
 require 'eventmachine'
 require 'roma/event/con_pool'
+require 'roma/event/jaro_winkler'
+#require 'roma/event/levenshtein'
 require 'roma/logging/rlogger'
 require 'roma/stats'
 require 'roma/storage/basic_storage'
@@ -167,10 +169,15 @@ module Roma
             send(@@ev_list[@lastcmd[0].downcase],@lastcmd)
             next if @@system_commands.key?(@lastcmd[0].downcase)
           else
-            @log.warn("command error:#{s}")
-            send_data("ERROR\r\n")
-            close_connection_after_writing
-            next
+            distance, similar_cmd = Roma::Event::Distance.check_distance(s[0], @@ev_list)
+            if distance < 0.2
+              send_data("\r\nERROR: '#{s[0]}' is not roma command.\r\nDid you mean this?\r\n\t#{similar_cmd}\r\n")
+              next
+            else
+              @log.warn("command error:#{s}")
+              send_data("ERROR: '#{s[0]}' is not roma command. Please check command.\r\n(closing telnet connection command is 'quit')\r\n")
+              next
+            end
           end
 
           # hilatency check

data/lib/roma/event/jaro_winkler.rb

@@ -0,0 +1,23 @@
+#
+# File: jaro_winkler.rb
+#
+require "jaro_winkler"
+
+module Roma
+  module Event
+    module Distance
+      def self.check_distance(cmd, ev_list)
+        jaro_winkler_distance = 0.0000 # initialize
+        similar_cmd = ''
+        ev_list.each_key{|ev|
+          distance = JaroWinkler.distance(cmd, ev)
+          if distance > jaro_winkler_distance
+            jaro_winkler_distance = distance 
+            similar_cmd = ev
+          end
+        }
+        return (1-jaro_winkler_distance), similar_cmd
+      end
+    end # module Distance
+  end # module Event
+end # module Roma

data/lib/roma/event/levenshtein.rb

@@ -0,0 +1,23 @@
+#
+# File: levenshtein.rb
+#
+require "levenshtein"
+
+module Roma
+  module Event
+    module Distance
+      def self.check_distance(cmd, ev_list)
+        levenshtein_distance = 1.0 # initialize
+        similar_cmd = ''
+        ev_list.each_key{|ev|
+          distance = Levenshtein::normalized_distance(cmd, ev)
+          if distance < levenshtein_distance
+            levenshtein_distance = distance 
+            similar_cmd = ev
+          end
+        }
+        return levenshtein_distance, similar_cmd
+      end
+    end # module Distance
+  end # module Event
+end # module Roma

data/lib/roma/plugin/plugin_cmd_aliases.rb

@@ -5,38 +5,7 @@ module Roma
     module PluginCommandAliases
       include ::Roma::CommandPlugin
 
-      # shutdown [reason]
-      def ev_shutdown(s)
-        send_data("*** ARE YOU REALLY SURE TO SHUTDOWN? *** (yes/no)\r\n")
-        if gets != "yes\r\n"
-          close_connection_after_writing
-          return
-        end
-
-        if s.length == 2
-          @log.info("Receive a shutdown #{s[1]}")
-        else
-          @log.info("Receive a shutdown command.")
-        end
-        @rttable.enabled_failover = false
-        res = broadcast_cmd("rshutdown\r\n")
-        send_data("#{res.inspect}\r\n")
-        close_connection_after_writing
-        @stop_event_loop = true
-      end
-
-      # rshutdown [reason]
-      def ev_rshutdown(s)
-        if s.length == 2
-          @log.info("Receive a rshutdown #{s[1]}")
-        else
-          @log.info("Receive a rshutdown command.")
-        end
-        @rttable.enabled_failover = false
-        send_data("BYE\r\n")
-        close_connection_after_writing
-        @stop_event_loop = true
-      end
+      # Please add your self if you want.
 
     end
   end

data/lib/roma/romad.rb

@@ -41,6 +41,26 @@ module Roma
     end
 
     def start
+      # config version check
+      if !Config.const_defined?(:VERSION)
+        @log.error("ROMA FAIL TO BOOT! : config.rb's version is too old.")
+        exit
+      elsif Config::VERSION != Roma::VERSION
+        if /(\d+)\.(\d+)\.(\d+)/ =~ Config::VERSION
+          version_config = ($1.to_i << 16) + ($2.to_i << 8) + $3.to_i
+        end
+        if /(\d+)\.(\d+)\.(\d+)/ =~ Roma::VERSION
+          version_roma = ($1.to_i << 16) + ($2.to_i << 8) + $3.to_i
+        end
+
+        if version_config == version_roma
+          @log.info("This version is development version.")
+        else 
+          @log.error("ROMA FAIL TO BOOT! : config.rb's version is differ from current ROMA version.")
+          exit
+        end
+      end
+
       if node_check(@stats.ap_str)
         @log.error("#{@stats.ap_str} is already running.")
         return
@@ -171,6 +191,9 @@ module Roma
       if Config.const_defined?(:LOG_SHIFT_AGE)
         @stats.log_shift_age = Config::LOG_SHIFT_AGE
       end
+      if Config.const_defined?(:LOG_LEVEL)
+        @stats.log_level = Config::LOG_LEVEL
+      end
     end
 
     def initialize_connection

data/lib/roma/routing/cb_rttable.rb

@@ -22,6 +22,7 @@ module Roma
       attr_accessor :event
       attr_accessor :event_limit_line
       attr_accessor :logs
+      attr_accessor :enabled_failover
       attr_reader :version_of_nodes
       attr_reader :min_version
 
@@ -57,6 +58,7 @@ module Roma
         ret['routing.event_limit_line'] = @event_limit_line
         ret['routing.version_of_nodes'] = @version_of_nodes.inspect
         ret['routing.min_version'] = @min_version
+        ret['routing.enabled_failover'] = @enabled_failover
         ret
       end
 

data/lib/roma/routing/random_partitioner.rb

@@ -1,25 +1,23 @@
 module Roma
   module Routing
     module RandomPartitioner
-
       def exclude_nodes(ap_str, rep_host)
-        exclude_nodes = self.nodes
+        exclude_nodes = nodes
         if rep_host
           exclude_nodes = [ap_str]
         else
           myhost = ap_str.split(/[:_]/)[0]
-          exclude_nodes.delete_if{|nid| nid.split(/[:_]/)[0] != myhost }
+          exclude_nodes.delete_if { |nid| nid.split(/[:_]/)[0] != myhost }
         end
         exclude_nodes
       end
-      
-      def exclude_nodes_for_join(ap_str, rep_host)
+
+      def exclude_nodes_for_join(ap_str, _rep_host)
         [ap_str]
       end
 
-      #alias :exclude_nodes_for_join :exclude_nodes
-      alias :exclude_nodes_for_recover :exclude_nodes
-      alias :exclude_nodes_for_balance :exclude_nodes
+      alias_method :exclude_nodes_for_recover, :exclude_nodes
+      alias_method :exclude_nodes_for_balance, :exclude_nodes
 
       def myhost_include?(nodes, myhost)
         nodes.each do |nid|
@@ -30,44 +28,54 @@ module Roma
       private :myhost_include?
 
       # vnode sampling exclude +exclude_nodes+
-      def select_vn_for_join(exclude_nodes)
+      def select_vn_for_join(exclude_nodes, rep_host)
         short_idx = {}
         myhost_idx = {}
         idx = {}
         myhost = exclude_nodes[0].split(/[:_]/)[0]
+
         @rd.v_idx.each_pair do |vn, nids|
           unless list_include?(nids, exclude_nodes)
             if myhost_include?(nids, myhost)
               myhost_idx[vn] = nids
             else
-              idx[vn] = nids # other nodes
+              idx[vn] = nids # other hosts
             end
             short_idx[vn] = nids if nids.length < @rd.rn
           end
         end
-        idx = short_idx if short_idx.length > 0
-      
-        ks = idx.keys
-        if ks.length == 0
+
+        # vnodes sampling priority:
+        # 1. Short vnodes
+        # 2. Other hosts vnodes
+        # 3. My host vnodes
+        if short_idx.length > 0
+          idx = short_idx
+        elsif idx.length == 0
           idx = myhost_idx
-          ks = idx.keys
-          return nil if ks.length == 0
-          vn = ks[rand(ks.length)]
-          nids = idx[vn]
-          [vn, nids, nids[0].split(/[:_]/)[0] == myhost]
+        end
+
+        return nil if idx.length == 0
+
+        ks = idx.keys
+        vn = ks[rand(ks.length)]
+        nids = idx[vn]
+
+        if !rep_host && nids[0].split(/[:_]/)[0] == myhost
+          is_primary = true
         else
-          vn = ks[rand(ks.length)]
-          nids = idx[vn]
-          [vn, nids, rand(@rd.rn) == 0]
+          is_primary = rand(@rd.rn) == 0
         end
+
+        [vn, nids, is_primary]
       end
 
       # select a vnodes where short of redundancy.
-      def select_vn_for_recover(exclude_nodes)
+      def select_vn_for_recover(exclude_nodes, _rep_host)
         ret = []
         @rd.v_idx.each_pair do |vn, nids|
-          if nids.length < @rd.rn && list_include?(nids,exclude_nodes) == false
-            ret << [vn,nids]
+          if nids.length < @rd.rn && list_include?(nids, exclude_nodes) == false
+            ret << [vn, nids]
           end
         end
         if ret.length == 0
@@ -79,27 +87,27 @@ module Roma
       end
 
       def select_node_for_release(ap_str, rep_host, nids)
-        buf = self.nodes
+        buf = nodes
 
         unless rep_host
           deny_hosts = []
-          nids.each{ |nid|
+          nids.each do |nid|
             host = nid.split(/[:_]/)[0]
             deny_hosts << host if host != ap_str.split(/[:_]/)[0]
-          }
-          buf.delete_if{|nid| deny_hosts.include?(nid.split(/[:_]/)[0])}
+          end
+          buf.delete_if { |nid| deny_hosts.include?(nid.split(/[:_]/)[0]) }
         else
-          nids.each{|nid| buf.delete(nid) }
+          nids.each { |nid| buf.delete(nid) }
         end
-        
-        buf.delete_if{|instance| instance == ap_str}
+
+        buf.delete_if { |instance| instance == ap_str }
         to_nid = buf.sample
-        new_nids = nids.map{|n| n == ap_str ? to_nid : n }
+        new_nids = nids.map { |n| n == ap_str ? to_nid : n }
         [to_nid, new_nids]
       end
 
       # vnode sampling exclude +exclude_nodes+
-      def select_vn_for_balance(exclude_nodes)
+      def select_vn_for_balance(exclude_nodes, _rep_host)
         short_idx = {}
         idx = {}
         @rd.v_idx.each_pair do |vn, nids|
@@ -109,14 +117,13 @@ module Roma
           end
         end
         idx = short_idx if short_idx.length > 0
-      
+
         ks = idx.keys
         return nil if ks.length == 0
         vn = ks[rand(ks.length)]
         nids = idx[vn]
         [vn, nids, rand(@rd.rn) == 0]
       end
-
     end
   end
 end

data/lib/roma/routing/rttable.rb

@@ -36,7 +36,8 @@ module Roma
       end
 
       def num_of_vn(ap)
-        pn = sn = short = lost = 0
+        pn = short = lost = 0
+        sn = Array.new(@rd.rn - 1, 0)
         @rd.v_idx.each_pair do |vn, nids|
           if nids == nil || nids.length == 0
             lost += 1
@@ -44,7 +45,8 @@ module Roma
           elsif nids[0] == ap
             pn += 1
           elsif nids.include?(ap)
-            sn += 1
+            i = nids.index(ap) - 1
+            sn[i] += 1
           end
           short += 1 if nids.length < @rd.rn
         end
@@ -61,7 +63,7 @@ module Roma
         ret['routing.div_bits'] = @div_bits
         ret['routing.vnodes.length'] = vnodes.length
         ret['routing.primary'] = pn
-        ret['routing.secondary'] = sn
+        (@rn-1).times{|i| ret["routing.secondary#{i+1}"] = sn[i]}
         ret['routing.short_vnodes'] = short
         ret['routing.lost_vnodes'] = lost
         ret['routing.fail_cnt_threshold'] = @fail_cnt_threshold

data/lib/roma/stats.rb

@@ -77,9 +77,10 @@ module Roma
     attr_accessor :gui_run_gather_logs
     attr_accessor :gui_last_snapshot
 
-    # for log rotate
+    # for log
     attr_accessor :log_shift_size
     attr_accessor :log_shift_age
+    attr_accessor :log_level
 
     def initialize
       @config_path = nil
@@ -121,6 +122,7 @@ module Roma
       @routing_trans_timeout = 3600 * 3 # 3hr
       @log_shift_size = 1048576
       @log_shift_age = 0
+      @log_level = :debug
     end
 
     def ap_str
@@ -171,6 +173,7 @@ module Roma
       ret['stats.routing_trans_timeout'] = @routing_trans_timeout
       ret['stats.log_shift_size'] = @log_shift_size
       ret['stats.log_shift_age'] = @log_shift_age
+      ret['stats.log_level'] = @log_level
       ret
     end