roma 0.8.2 → 0.8.10

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

@@ -0,0 +1,4 @@
+
+module Roma
+  VERSION = "0.8.10"
+end

data/{lib → ruby/server/lib}/roma/write_behind.rb

@@ -134,6 +134,7 @@ module Roma
       @wb_thread = Thread.new{
         wb_process_loop
       }
+      @wb_thread[:name] = 'write_behind'
     rescue =>e
       @log.error("#{e}\n#{$@}")
     end

data/ruby/server/test/config4mhash.rb

@@ -0,0 +1,68 @@
+require 'roma/storage/rh_storage'
+require 'roma/storage/tc_storage'
+
+module Roma
+  
+  module Config
+    DEFAULT_PORT = 12000
+    DEFAULT_NAME = 'ROMA'
+
+    # :no_action | :auto_assign | :shutdown
+    DEFAULT_LOST_ACTION = :auto_assign
+
+    # log setting
+    LOG_SHIFT_AGE = 10
+    LOG_SHIFT_SIZE = 1024 * 1024 * 10
+    LOG_PATH = '.'
+    # :debug | :info | :warn | :error
+    LOG_LEVEL = :debug
+
+    # routing setting
+    RTTABLE_PATH = '.'
+
+    # connection setting
+    # like a MaxStartups spec in the sshd_config
+    # 'start:rate:full'
+    CONNECTION_CONTINUOUS_LIMIT = '200:30:300'
+
+    # storage setting
+    STORAGE_CLASS = Storage::TCStorage
+    STORAGE_DIVNUM = 10
+    STORAGE_PATH = '.'
+    STORAGE_DUMP_PATH = '/tmp'
+    STORAGE_OPTION = ''
+
+    # 5 days ago
+    STORAGE_DELMARK_EXPTIME = 60 * 60 * 24 * 5
+
+    # data copy setting
+    DATACOPY_STREAM_COPY_WAIT_PARAM = 0.0001
+
+    # plugin setting
+    PLUGIN_FILES = ['plugin_storage.rb','plugin_alist.rb']
+
+    # write-behind setting
+    WRITEBEHIND_PATH = './wb'
+    WRITEBEHIND_SHIFT_SIZE = 1024 * 1024 * 10
+
+    # redundant setting
+    REDUNDANT_ZREDUNDANT_SIZE = 0
+
+    def self.get_stat
+      ret = {}
+      ret['config.DEFAULT_LOST_ACTION'] = DEFAULT_LOST_ACTION
+      ret['config.LOG_SHIFT_AGE'] = LOG_SHIFT_AGE
+      ret['config.LOG_SHIFT_SIZE'] = LOG_SHIFT_SIZE
+      ret['config.LOG_PATH'] = File.expand_path(LOG_PATH)
+      ret['config.RTTABLE_PATH'] = File.expand_path(RTTABLE_PATH)
+      ret['config.STORAGE_DELMARK_EXPTIME'] = STORAGE_DELMARK_EXPTIME
+      ret['config.DATACOPY_STREAM_COPY_WAIT_PARAM'] = DATACOPY_STREAM_COPY_WAIT_PARAM
+      ret['config.PLUGIN_FILES'] = PLUGIN_FILES.inspect
+      ret['config.WRITEBEHIND_PATH'] = File.expand_path(WRITEBEHIND_PATH)
+      ret['config.WRITEBEHIND_SHIFT_SIZE'] = WRITEBEHIND_SHIFT_SIZE
+      ret
+    end
+
+  end
+
+end

data/ruby/server/test/config4storage_error.rb

@@ -0,0 +1,69 @@
+require 'roma/storage/rh_storage'
+require 'roma/storage/storage_error_storage'
+
+module Roma
+  
+  module Config
+    DEFAULT_PORT = 12000
+    DEFAULT_NAME = 'ROMA'
+
+    # :no_action | :auto_assign | :shutdown
+    DEFAULT_LOST_ACTION = :auto_assign
+
+    # log setting
+    LOG_SHIFT_AGE = 10
+    LOG_SHIFT_SIZE = 1024 * 1024 * 10
+    LOG_PATH = '.'
+    # :debug | :info | :warn | :error
+    LOG_LEVEL = :debug
+
+    # routing setting
+    RTTABLE_PATH = '.'
+
+    # connection setting
+    # like a MaxStartups spec in the sshd_config
+    # 'start:rate:full'
+    CONNECTION_CONTINUOUS_LIMIT = '200:30:300'
+
+    # storage setting
+#    STORAGE_CLASS = Roma::Storage::RubyHashStorage
+    STORAGE_CLASS = Storage::StorageErrorStorage
+    STORAGE_DIVNUM = 10
+    STORAGE_PATH = '.'
+    STORAGE_DUMP_PATH = '/tmp'
+    STORAGE_OPTION = ''
+
+    # 5 days ago
+    STORAGE_DELMARK_EXPTIME = 60 * 60 * 24 * 5
+
+    # data copy setting
+    DATACOPY_STREAM_COPY_WAIT_PARAM = 0.0001
+
+    # plugin setting
+    PLUGIN_FILES = ['plugin_storage.rb','plugin_alist.rb','plugin_map.rb']
+
+    # write-behind setting
+    WRITEBEHIND_PATH = './wb'
+    WRITEBEHIND_SHIFT_SIZE = 1024 * 1024 * 10
+
+    # redundant setting
+    REDUNDANT_ZREDUNDANT_SIZE = 0
+
+    def self.get_stat
+      ret = {}
+      ret['config.DEFAULT_LOST_ACTION'] = DEFAULT_LOST_ACTION
+      ret['config.LOG_SHIFT_AGE'] = LOG_SHIFT_AGE
+      ret['config.LOG_SHIFT_SIZE'] = LOG_SHIFT_SIZE
+      ret['config.LOG_PATH'] = File.expand_path(LOG_PATH)
+      ret['config.RTTABLE_PATH'] = File.expand_path(RTTABLE_PATH)
+      ret['config.STORAGE_DELMARK_EXPTIME'] = STORAGE_DELMARK_EXPTIME
+      ret['config.DATACOPY_STREAM_COPY_WAIT_PARAM'] = DATACOPY_STREAM_COPY_WAIT_PARAM
+      ret['config.PLUGIN_FILES'] = PLUGIN_FILES.inspect
+      ret['config.WRITEBEHIND_PATH'] = File.expand_path(WRITEBEHIND_PATH)
+      ret['config.WRITEBEHIND_SHIFT_SIZE'] = WRITEBEHIND_SHIFT_SIZE
+      ret
+    end
+
+  end
+
+end

data/{lib/roma/config.rb → ruby/server/test/config4test.rb}

@@ -1,5 +1,3 @@
-require 'roma/routing/rttable'
-require 'roma/routing/cb_rttable'
 require 'roma/storage/rh_storage'
 
 module Roma
@@ -21,6 +19,11 @@ module Roma
     # routing setting
     RTTABLE_PATH = '.'
 
+    # connection setting
+    # like a MaxStartups spec in the sshd_config
+    # 'start:rate:full'
+    CONNECTION_CONTINUOUS_LIMIT = '200:30:300'
+
     # storage setting
     STORAGE_CLASS = Roma::Storage::RubyHashStorage
     STORAGE_DIVNUM = 10
@@ -35,7 +38,7 @@ module Roma
     DATACOPY_STREAM_COPY_WAIT_PARAM = 0.0001
 
     # plugin setting
-    PLUGIN_FILES = []
+    PLUGIN_FILES = ['plugin_storage.rb','plugin_alist.rb','plugin_map.rb','plugin_mapcount.rb']
 
     # write-behind setting
     WRITEBEHIND_PATH = './wb'

data/{test → ruby/server/test}/rcirb.rb

@@ -6,7 +6,6 @@ require 'irb'
 
 path =  File.dirname(File.expand_path($PROGRAM_NAME))
 $LOAD_PATH << path + "/../lib"
-$LOAD_PATH << path  + "/../../commons/lib"
 $LOAD_PATH << path  + "/../../client/lib"
 
 require 'roma/client/rclient'

data/{test → ruby/server/test}/roma-test-utils.rb

@@ -1,8 +1,9 @@
 require 'shell'
-
 require 'pathname'
 require 'fileutils'
 require 'rbconfig'
+require 'roma/config'
+require 'roma/messaging/con_pool'
 
 module RomaTestUtils
   module_function
@@ -18,6 +19,10 @@ module RomaTestUtils
     server_base_dir + "bin"
   end
 
+  def server_test_dir
+    server_base_dir + "test"
+  end
+
   def mkroute_path
     (server_bin_dir + "mkroute").to_s
   end
@@ -31,23 +36,30 @@ module RomaTestUtils
               RbConfig::CONFIG["ruby_install_name"])
   end
 
-  def start_roma
+  def start_roma conf='config4test.rb'
     sh = Shell.new
     sh.transact do
       Dir.glob("localhost_1121?.*").each{|f| rm f }
     end
-    FileUtils.rm_rf("localhost_11211")
-    FileUtils.rm_rf("localhost_11212")
+    FileUtils.rm_rf("#{Roma::Config::STORAGE_PATH}/localhost_11211")
+    FileUtils.rm_rf("#{Roma::Config::STORAGE_PATH}/localhost_11212")
     sleep 0.1
 
     sh.system(ruby_path, mkroute_path,
               "localhost_11211","localhost_11212",
               "-d","3",
               "--enabled_repeathost")
-    sleep 0.1
-    sh.system(ruby_path,romad_path,"localhost","-p","11211","-d","--verbose")
-    sh.system(ruby_path,romad_path,"localhost","-p","11212","-d","--verbose")
-    sleep 0.5
+    sleep 0.2
+    do_command_romad conf
+    sleep 1
+  end
+
+  def do_command_romad conf
+    sh = Shell.new
+    sh.system(ruby_path,romad_path,"localhost","-p","11211","-d","--verbose",
+              "--disabled_cmd_protect","--config","#{server_test_dir}/#{conf}")
+    sh.system(ruby_path,romad_path,"localhost","-p","11212","-d","--verbose",
+              "--disabled_cmd_protect","--config","#{server_test_dir}/#{conf}")
   end
 
   def stop_roma
@@ -59,6 +71,7 @@ module RomaTestUtils
       conn.gets
       conn.close
     end
+    Roma::Client::ConPool.instance.close_all
   rescue =>e
     puts "#{e} #{$@}"
   end

data/{test → ruby/server/test}/run-test.rb

@@ -5,10 +5,11 @@ require 'pathname'
 
 base_path = Pathname(__FILE__).dirname.parent.parent.expand_path
 $LOAD_PATH.unshift("#{base_path}/server/lib")
-$LOAD_PATH.unshift("#{base_path}/client/lib")
-$LOAD_PATH.unshift("#{base_path}/commons/lib")
 $LOAD_PATH.unshift("#{base_path}/server/test")
 
+client_base_path = Pathname(__FILE__).dirname.parent.parent.parent.parent.expand_path
+$LOAD_PATH.unshift("#{client_base_path}/roma-ruby-client/lib")
+
 require 'roma-test-utils'
 
 Dir["#{base_path}/server/test/t_*.rb"].each do |test_file|

data/ruby/server/test/storage_error_storage.rb

@@ -0,0 +1,37 @@
+require 'roma/storage/basic_storage'
+
+module Roma
+  module Storage
+
+    class Dummy
+      def put(k,v)
+        raise StorageException, "error:get"
+      end
+      def get(k)
+        raise StorageException, "error:get"
+      end
+      def out(k)
+        true
+      end
+      def rnum
+        0
+      end
+      def each
+      end
+    end
+
+    class StorageErrorStorage < BasicStorage
+
+      def opendb
+        create_div_hash
+        @divnum.times{ |i|
+          @hdb[i] = Dummy.new
+        }
+      end
+
+      def close_db(hdb); end
+
+    end # class StorageErrorStorage
+
+  end # module Storage
+end # module Roma

data/ruby/server/test/t_command_definition.rb

@@ -0,0 +1,326 @@
+#!/usr/bin/env ruby
+require 'roma/command/command_definition'
+require 'digest/sha1'
+require 'test/unit'
+
+module CommandModuleTest1
+  include Roma::Command::Definition
+
+  def_command_with_relay :balse do |s|
+    command_argument_validation_num s, 3
+    case s[2]
+    when 'ex_runtime'
+      raise s[1]
+    when 'ex_client'
+      raise Roma::Command::Definition::ClientErrorException, s[1]
+    when 'ex_server'
+      raise Roma::Command::Definition::ServerErrorException, s[1]
+    end
+    s
+  end
+
+  def_read_command_with_key :rget, :no_forward do |ctx|
+    ctx
+  end
+
+  def_write_command_with_key :wget, :no_forward do |ctx|
+    ctx
+  end
+
+  def_command_with_key :get, :no_forward do |ctx|
+    case ctx.argv[2]
+    when 'ex_runtime'
+      raise ctx.argv[1]
+    when 'ex_client'
+      raise Roma::Command::Definition::ClientErrorException, ctx.argv[1]
+    when 'ex_server'
+      raise Roma::Command::Definition::ServerErrorException, ctx.argv[1]
+    end
+    ctx
+  end
+
+  def_write_command_with_key_value :wset, 4, :no_forward do |ctx|
+    ctx
+  end
+
+  def_read_command_with_key_value :rset, 4, :no_forward do |ctx|
+    ctx
+  end
+
+  def_command_with_key_value :set, 4, :no_forward do |ctx|
+    case ctx.argv[2]
+    when 'ex_runtime'
+      raise ctx.argv[1]
+    when 'ex_client'
+      raise Roma::Command::Definition::ClientErrorException, ctx.argv[1]
+    when 'ex_server'
+      raise Roma::Command::Definition::ServerErrorException, ctx.argv[1]
+    end
+    ctx
+  end
+end
+
+module CommandModuleTest2
+  include Roma::Command::Definition
+
+  def_command_with_relay :runtimeexception do |s|
+    raise
+  end
+end
+
+module CommandModuleTest3
+  include Roma::Command::Definition
+
+  def_command_with_relay :balse do |s|
+    "override"
+  end
+end
+
+class DefCmdTest
+  include Roma::Command::Definition
+  include CommandModuleTest1
+  include CommandModuleTest2
+
+  #
+  # define stub for test
+  #
+
+  class RtStub
+    attr_reader :hbits
+
+    def initialize
+      @hbits = 10
+    end
+
+    def get_vnode_id(d) 1 end
+    def search_nodes_for_write(vn) ['roma0','roma1'] end
+  end
+
+  class LogStub
+    def warn str
+    end
+  end
+
+  class StorageStub
+    def get_raw(*arg)
+      nil
+    end
+  end
+
+  def initialize
+    @stats = Struct.new(:ap_str).new(:ap_str)
+    @rttable = RtStub.new
+    @defhash = 'roma'
+    @log = LogStub.new
+    @storages = Hash.new(StorageStub.new)
+  end
+
+  def send_data str
+    str
+  end
+
+  def broadcast_cmd str
+    {:broadcast_cmd=>str}
+  end
+
+  def read_bytes n
+    ret = 'a'
+    (n - 1).times{ ret += ret[-1].succ }
+    ret
+  end
+
+  def command_argument_validation_num s, num
+    raise ClientErrorException, "number of arguments (#{s.length - 1} for #{num - 1})" if s.length != num
+  end
+end
+
+class DefineCommandTest < Test::Unit::TestCase
+
+  def setup
+    @obj = DefCmdTest.new
+  end
+
+  def teardown
+  end
+
+  def test_defcmd
+    # normal case
+    res = @obj.ev_balse ['balse','arg1','arg2']
+    res = eval res.chomp
+    assert_equal ['balse','arg1','arg2'], res[:ap_str]
+    assert_equal "rbalse arg1 arg2\r\n", res[:broadcast_cmd]
+
+    res = @obj.ev_rbalse ['balse','arg1','arg2']
+    res = eval res.chomp
+    assert_equal ['balse','arg1','arg2'], res
+
+    # case of argument error
+    res = @obj.ev_balse ['balse','arg1']
+    assert_equal "CLIENT_ERROR number of arguments (1 for 2)\r\n", res
+    res = @obj.ev_balse ['balse','arg1', 'arg2', 'arg3']
+    assert_equal "CLIENT_ERROR number of arguments (3 for 2)\r\n", res
+
+    # case of exception occur
+    assert_raise RuntimeError do
+      res = @obj.ev_balse ['balse','arg1','ex_runtime']
+    end
+    res = @obj.ev_balse ['balse','arg1','ex_client']
+    assert_equal "CLIENT_ERROR arg1\r\n", res
+    res = @obj.ev_balse ['balse','arg2','ex_server']
+    assert_equal "SERVER_ERROR arg2\r\n", res
+  end
+
+  def test_defcmd2
+    # define a command in DefCmdTest class is not define yet
+    DefCmdTest.class_eval do
+      def_command_with_relay :balse2 do |s|
+        "#{s.join(' ')} #{@stats.ap_str}"
+      end
+    end
+    assert true
+
+    # define the duplicated command in DefCmdTest scope
+    assert_raise RuntimeError do
+      DefCmdTest.class_eval do
+        def_command_with_relay :balse do |s|
+          "#{s.join(' ')} #{@stats.ap_str}"
+        end
+      end
+    end
+
+    # define the duplicated command in CommandModuleTest3 scope
+    # RuntimeError is nothing to occur
+    DefCmdTest.class_eval do
+      include CommandModuleTest3
+    end
+
+    res = @obj.ev_balse ['balse','arg1','arg2']
+    robj = eval res.chomp # String -> Hash
+    assert_equal "override", robj[:ap_str]
+    assert_equal "rbalse arg1 arg2\r\n", robj[:broadcast_cmd]
+
+    res = @obj.ev_rbalse ['balse','arg1','arg2']
+    assert_equal "override\r\n", res
+
+    # test for exception occured in a command
+    assert_raise RuntimeError do
+      @obj.ev_runtimeexception ['balse']
+    end
+  end
+
+  def test_defcmd_k
+    # normal case
+    ctx = @obj.ev_get ['get','arg1']
+    assert_equal ['get','arg1'], ctx.argv
+    assert_equal 'arg1', ctx.params.key
+    assert_equal 'roma', ctx.params.hash_name
+    assert_equal Digest::SHA1.hexdigest('arg1').hex % 10, ctx.params.digest
+    assert_equal 1, ctx.params.vn
+    assert_equal ['roma0','roma1'], ctx.params.nodes
+
+    ctx = @obj.ev_get ['get',"arg2\eruby"]
+    assert_equal ['get',"arg2\eruby"], ctx.argv
+    assert_equal 'arg2', ctx.params.key
+    assert_equal 'ruby', ctx.params.hash_name
+    assert_equal 1, ctx.params.vn
+    assert_equal Digest::SHA1.hexdigest('arg2').hex % 10, ctx.params.digest
+    assert_equal ['roma0','roma1'], ctx.params.nodes
+
+    # case of argument error
+    res = @obj.ev_get ['get']
+    assert_equal "CLIENT_ERROR dose not find key\r\n", res
+    res = @obj.ev_get []
+    assert_equal "CLIENT_ERROR dose not find key\r\n", res
+
+    # case of exception occur
+    assert_raise RuntimeError do
+      res = @obj.ev_get ['get','arg1','ex_runtime']
+    end
+    res = @obj.ev_get ['get','arg1','ex_client']
+    assert_equal "CLIENT_ERROR arg1\r\n", res
+    res = @obj.ev_get ['get','arg2','ex_server']
+    assert_equal "SERVER_ERROR arg2\r\n", res
+  end
+
+  def test_defcmd_kv
+    # normal case
+    ctx = @obj.ev_set ['set','arg1', '0', '0', '5']
+    assert_equal ['set','arg1', '0', '0', '5'], ctx.argv
+    assert_equal 'arg1', ctx.params.key
+    assert_equal 'roma', ctx.params.hash_name
+    assert_equal Digest::SHA1.hexdigest('arg1').hex % 10, ctx.params.digest
+    assert_equal 1, ctx.params.vn
+    assert_equal ['roma0','roma1'], ctx.params.nodes
+    assert_equal 'abcde', ctx.params.value
+
+    ctx = @obj.ev_set ['set',"arg2\eruby", '0', '0', '5']
+    assert_equal ['set',"arg2\eruby", '0', '0', '5'], ctx.argv
+    assert_equal 'arg2', ctx.params.key
+    assert_equal 'ruby', ctx.params.hash_name
+    assert_equal Digest::SHA1.hexdigest('arg2').hex % 10, ctx.params.digest
+    assert_equal 1, ctx.params.vn
+    assert_equal ['roma0','roma1'], ctx.params.nodes
+    assert_equal 'abcde', ctx.params.value
+
+    # case of argument error
+    res = @obj.ev_set ['set']
+    assert_equal "CLIENT_ERROR dose not find key\r\n", res
+    res = @obj.ev_set []
+    assert_equal "CLIENT_ERROR dose not find key\r\n", res
+
+    # case of exception occur
+    assert_raise RuntimeError do
+      res = @obj.ev_set ['set','arg1','ex_runtime']
+    end
+    res = @obj.ev_set ['set','arg1','ex_client']
+    assert_equal "CLIENT_ERROR arg1\r\n", res
+    res = @obj.ev_set ['set','arg2','ex_server']
+    assert_equal "SERVER_ERROR arg2\r\n", res
+  end
+end
+
+class DefCmdTestNoHash < DefCmdTest
+  def initialize
+    super
+    @storages = {}
+  end
+end
+
+class DefineCommandNoHashTest < Test::Unit::TestCase
+  def setup
+    @obj = DefCmdTestNoHash.new
+  end
+
+  def teardown
+  end
+
+  def test_rcwk
+    ret = @obj.ev_rget ['get',"arg1\eno_hash_name"]
+    assert_equal "SERVER_ERROR no_hash_name dose not exists.\r\n", ret
+  end
+
+  def test_wcwk
+    ret = @obj.ev_wget ['get',"arg1\eno_hash_name"]
+    assert_equal "SERVER_ERROR no_hash_name dose not exists.\r\n", ret
+  end
+
+  def test_cwk
+    ret = @obj.ev_get ['get',"arg1\eno_hash_name"]
+    assert_equal "SERVER_ERROR no_hash_name dose not exists.\r\n", ret
+  end
+
+  def test_rcwkv
+    ret = @obj.ev_rset ['set',"arg1\eno_hash_name", '0', '0', '5']
+    assert_equal "SERVER_ERROR no_hash_name dose not exists.\r\n", ret
+  end
+
+  def test_wcwkv
+    ret = @obj.ev_wset ['set',"arg1\eno_hash_name", '0', '0', '5']
+    assert_equal "SERVER_ERROR no_hash_name dose not exists.\r\n", ret
+  end
+
+  def test_cwkv
+    ret = @obj.ev_set ['set',"arg1\eno_hash_name", '0', '0', '5']
+    assert_equal "SERVER_ERROR no_hash_name dose not exists.\r\n", ret
+  end
+end