roma 0.8.12 → 0.8.13p1

data/ruby/server/lib/roma/tools/simple_bench.rb

@@ -18,7 +18,7 @@ Thread.new do
   end
 end
 
-def random_rquest_sender(ini_nodes, n)
+def random_request_sender(ini_nodes, n)
   puts __method__
   rc=Roma::Client::RomaClient.new(ini_nodes)
 
@@ -80,7 +80,7 @@ opts.banner = "usage:#{File.basename($0)} [options] addr:port"
 opts.on("-s", "--set", "set request"){|v| param[:set] = v }
 opts.on("-g", "--get", "get request"){|v| param[:get] = v }
 opts.on("-r", "--rand", "random request"){|v| param[:rand] = v }
-opts.on("-n", "--num [num]", "number of kyes"){|v| param[:num] = v.to_i }
+opts.on("-n", "--num [num]", "number of keys"){|v| param[:num] = v.to_i }
 opts.on("-t", "--threads [num]", "number of threads"){|v| param[:th] = v.to_i }
 opts.parse!(ARGV)
 
@@ -99,7 +99,7 @@ param[:th].times do |i|
   t << Thread.new do
     get_sequence(ARGV, param[:num]) if param.key?(:get)
     set_sequence(ARGV, param[:num]) if param.key?(:set)
-    random_rquest_sender(ARGV, param[:num]) if param.key?(:rand)
+    random_request_sender(ARGV, param[:num]) if param.key?(:rand)
   end
 end
 

data/ruby/server/lib/roma/tools/simple_bench2.rb

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-# -*- coding: utf-8 -*-
 require 'date'
 require 'roma/client/rclient'
 
@@ -52,7 +51,7 @@ module Roma
 end
 
 
-def random_rquest_sender(ini_nodes)
+def random_request_sender(ini_nodes)
   rc=Roma::Client::RomaClient.new(ini_nodes)
 
   n=10000

data/ruby/server/lib/roma/tools/ssroute.rb

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-# -*- coding: utf-8 -*-
 #
 # usage:ssroute address_port
 #

data/ruby/server/lib/roma/tools/tribunus.rb

@@ -1,5 +1,4 @@
 #!/usr/bin/ruby
-# encoding: utf-8
 require 'socket'
 require 'ipaddr'
 require 'optparse'
@@ -46,7 +45,7 @@ class Tribunus
     @remote_servers={} #ipaddr => RomadHost
 
   end
-  
+
   def from_remote?(ipaddr)
       from_remote= !Socket.ip_address_list.any?{|addr|addr.ip_address==ipaddr}
   end
@@ -67,7 +66,7 @@ class Tribunus
     if(Process.waitpid2(pid)[1].to_i!=0)
       raise "failed to make route"
     end
-    
+
     @local_romad_host.ports.each do|port|
       pid=Process.spawn(@ruby_command_name,*RUBY_COMMAND_OPTIONS,ROMAD_PATH,*ROMAD_OPTIONS,"-p",port.to_s,@local_romad_host.hostname, :chdir=>@romad_work_dir)
       @romads[port]=pid
@@ -163,7 +162,7 @@ class Tribunus
       end
 
 
-      
+
 
       sleep(HEARTBEAT_LOOP_INTERVAL)
     end
@@ -288,10 +287,10 @@ if ports.size >100
 end
 
 tri=Tribunus.new(hostname,ports,conf)
-case conf[:mode] 
+case conf[:mode]
 when:new_ring
   tri.start_new_ring
-when :join 
+when :join
   tri.start_join(conf[:joining_node][0],conf[:joining_node][1])
 else
   tri.start_discover

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

@@ -1,4 +1,4 @@
 
 module Roma
-  VERSION = "0.8.12"
+  VERSION = "0.8.13-p1"
 end

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

@@ -7,6 +7,8 @@ module Roma
     
     class FileWriter
 
+      attr_accessor :shift_size
+
       def initialize(path, shift_size, log)
         @stats = Roma::Stats.instance
         path.chop! if path[-1]=='/'
@@ -43,6 +45,7 @@ module Roma
         fd = @fdh[hname]
         unless fd
           fd = openfile(hname)
+          @log.info("WriteBehind file has been created: [#{@fnh[hname]}]")
           @total_size[hname] = 0
         end
         klen = key.length
@@ -66,7 +69,7 @@ module Roma
         @fnh.delete(hname)
         sleep 0.01 while @do_write
         fd_old.close
-        @log.info("WriteBehind:rotate sccseed")
+        @log.info("WriteBehind:rotate succeed")
         true
       end
 

data/ruby/server/test/rcirb.rb

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-# -*- coding: utf-8 -*-
 
 require 'pp'
 require 'irb'

data/ruby/server/test/t_cpdata.rb

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-# -*- coding: utf-8 -*-
 
 require 'roma/client/rclient'
 require 'roma/messaging/con_pool'
@@ -83,7 +82,7 @@ rescue =>e
   false
 end
 
-# vnode をコピーするテスト
+# test of copying vnode
 class CopyDataTest < Test::Unit::TestCase
   include RomaTestUtils
 
@@ -98,10 +97,10 @@ class CopyDataTest < Test::Unit::TestCase
     @th.kill
     $gs.close
     Roma::Messaging::ConPool::instance.close_all
-  end  
+  end
 
   def test_spushv
-    # vn = 0 のキー
+    # key wihch's vn = 0
     keys = []
     n = 1000
     n.times{|i|
@@ -124,7 +123,7 @@ class CopyDataTest < Test::Unit::TestCase
   def push_a_vnode_stream(hname, vn, nid, keys)
     con = Roma::Messaging::ConPool.instance.get_connection(nid)
     con.write("spushv #{hname} #{vn}\r\n")
-    
+
     res = con.gets # READY\r\n or error string
     if res != "READY\r\n"
       con.close
@@ -137,7 +136,7 @@ class CopyDataTest < Test::Unit::TestCase
       con.write(data)
     }
     con.write("\0"*20) # end of steram
-    
+
     res = con.gets # STORED\r\n or error string
     Roma::Messaging::ConPool.instance.return_connection(nid,con)
     res.chomp! if res
@@ -155,7 +154,7 @@ class CopyDataTest < Test::Unit::TestCase
     dat[0] = reqpushv('roma',0)
     assert_not_nil( dat[0] )
     dat[0] = reqpushv('roma',0)
-    assert_not_nil( dat[0] )  # 同じ vnode を2度アクセスしても良いことを確認
+    assert_not_nil( dat[0] )  # confirming twice access to same node
 
     dat[1] = reqpushv('roma',536870912)
     assert_not_nil( dat[1] )
@@ -184,7 +183,7 @@ class CopyDataTest < Test::Unit::TestCase
     $dat[vn]
   end
 
-  # n 個の dummy data を set
+  # set dummy data of n count
   def make_dummy(n)
     n.times{|i|
       assert( @rc.set(i.to_s,i.to_s)=="STORED" )
@@ -230,5 +229,5 @@ class CopyDataTest < Test::Unit::TestCase
     @log.error("#{e}\n#{$@}")
     false
   end
-  
+
 end

data/ruby/server/test/t_rclient.rb

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-# -*- coding: utf-8 -*-
 
 require 'roma/client/rclient'
 require 'roma/messaging/con_pool'
@@ -194,6 +193,6 @@ class RClientTestForceForward < RClientTest
         @rd.v_idx[d & @search_mask][1]
       end
     }
-  end  
+  end
 
 end

data/ruby/server/test/t_routing_data.rb

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-# -*- coding: utf-8 -*-
 
 require 'roma/routing/routing_data'
 require 'yaml'
@@ -15,7 +14,7 @@ class RoutingDataTest < Test::Unit::TestCase
     GC.start
     n=0
     ObjectSpace.each_object{|o| n+=1 }
-    n    
+    n
   end
 
   def test_object_count
@@ -64,12 +63,12 @@ class RoutingDataTest < Test::Unit::TestCase
   end
 
   def test_create
-    # ダイジェストの総ビット数 32
-    # バーチャルノードのビット数 8
-    # 冗長度 1
-    # ノードIDの配列 [roma0_3300]
+    # digest bit count 32
+    # vn bit count 8
+    # redundancy 1
+    # array of node ID [roma0_3300]
     rd=Roma::Routing::RoutingData.create(32,8,1,['roma0_3300'])
-    
+
     assert( rd.v_idx.length==256 )
     assert( rd.nodes.length==1 )
     assert( rd.search_mask==0xff000000 )
@@ -77,10 +76,10 @@ class RoutingDataTest < Test::Unit::TestCase
     assert( rd.div_bits==8 )
     assert( rd.rn==1 )
 
-    # ダイジェストの総ビット数 32
-    # バーチャルノードのビット数 16
-    # 冗長度 2
-    # ノードIDの配列 ['roma0_3300','roma1_3300','roma2_3300']
+    # digest bit count 32
+    # vn bit count 16
+    # redundancy 2
+    # array of node ID ['roma0_3300','roma1_3300','roma2_3300']
     rd=Roma::Routing::RoutingData.create(32,16,2,['roma0_3300','roma1_3300','roma2_3300'])
 
     assert( rd.v_idx.length==65536 )
@@ -101,14 +100,14 @@ class RoutingDataTest < Test::Unit::TestCase
         c2+=1
       end
     }
-    # バラつきは10%より小さいでしょ
+    # confirming dispersion is lower than 10%
     assert( (c0-c1).abs < rd.v_idx.length/10 )
     assert( (c1-c2).abs < rd.v_idx.length/10 )
   end
 
   def test_dump_binary
     rd=Roma::Routing::RoutingData.create(32,9,2,['roma0_3300','roma1_3300'])
-    # set to a bummy clock 
+    # set to a bummy clock
     (2**rd.div_bits).times{|i|
       vn=i<<(rd.dgst_bits-rd.div_bits)
       rd.v_clk[vn] = i
@@ -151,7 +150,7 @@ class RoutingDataTest < Test::Unit::TestCase
 
   def test_dump_binary2
     rd=Roma::Routing::RoutingData.create(32,9,2,['roma0_3300','roma1_3300'])
-    # set to a bummy clock 
+    # set to a bummy clock
     (2**rd.div_bits).times{|i|
       vn=i<<(rd.dgst_bits-rd.div_bits)
       rd.v_clk[vn] = i

data/ruby/server/test/t_storage.rb

@@ -304,7 +304,7 @@ class TCStorageTest < Test::Unit::TestCase
     n.times{|i|
       @st.set(3,"key3-#{i}",0,Time.now.to_i-100,"val3-#{i}")
     }
-    # 10 kyes deleted
+    # 10 keys deleted
     cnt=0
     @st.each_clean_up(Time.now.to_i-100,vnhash){|k,vn|
       assert_equal(3, vn)

data/ruby/server/test/t_writebehind.rb

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-# -*- coding: utf-8 -*-
 require 'logger'
 require 'stringio'
 require 'roma/write_behind'
@@ -9,7 +8,7 @@ require 'roma/client/plugin/alist'
 require 'roma/client/plugin/map'
 
 class FileWriterTest < Test::Unit::TestCase
-  
+
   def initialize(arg)
     super(arg)
   end
@@ -24,7 +23,7 @@ class FileWriterTest < Test::Unit::TestCase
     system('rm -rf wb_test')
   end
 
-  # 作成と write のテスト
+  # making and writing test
   def test_wb_write
     system('rm -rf wb_test')
     fw = Roma::WriteBehind::FileWriter.new("wb_test", 1024 * 1024, Logger.new(nil))
@@ -55,7 +54,7 @@ class FileWriterTest < Test::Unit::TestCase
     assert_equal(1,wb1.length )
   end
 
-  # サイズによるローテーションのテスト
+  # rotation test per data
   def test_wb_rotation
     system('rm -rf wb_test')
     fw = Roma::WriteBehind::FileWriter.new("wb_test", 900, Logger.new(nil))
@@ -74,56 +73,56 @@ class FileWriterTest < Test::Unit::TestCase
     assert(!File.exist?("#{path}/4.wb"))
   end
 
-  # 時間によるローテーションのテスト
+  # rotation test per time
   def test_rotation2
     system('rm -rf wb_test')
     fw = Roma::WriteBehind::FileWriter.new("wb_test", 1024 * 1024, Logger.new(nil))
     path = "wb_test/roma0_11211/roma/#{Time.now.strftime('%Y%m%d')}/"
 
-    # インスタンス生成直後の rottime の時分秒usecは何かの値を持っている
+    # rottime's usec have some value,from instance was created
     rt = fw.instance_eval{ @rottime }
     assert_not_equal(0, rt.hour + rt.min + rt.sec+ rt.usec)
-    # 初期化は今日の日付で行われる
+    # formatting execute in today's date
     assert_equal(Time.now.day, rt.day)
-    # ファイルは存在しない
+    # confirming the file do not exist
     assert(!File.exist?("#{path}/0.wb"))
     fw.write('roma',1,"key","val")
-    # 何かを書き込むとオープンされ、そのタイミングで rottime が更新される
+    # Open when somenthing to write,and in same timing rottime is updated
     rt = fw.instance_eval{ @rottime }
-    # この時、日付以下は 0 となる
+    # In this time, under of date become "0"
     assert_equal(0, rt.hour + rt.min + rt.sec+ rt.usec)
-    # 日付は明日になる
+    # date become tomorrow
     assert_not_equal(Time.now.day, rt.day)
     10.times{|i|
       fw.write('roma',i,"key-#{i}","val-#{i}")
     }
-    # ファイルは1つ
+    # confirming file is only 1 not over 2
     assert(File.exist?("#{path}/0.wb"))
     assert(!File.exist?("#{path}/1.wb"))
-    
-    # ローテーションの時刻を強制的に今にする
+
+    # set rottime to now forcibly
     fw.instance_eval{ @rottime=Time.now }
-    # rottime の変更を確認
+    # confriming to change rottime
     assert_not_equal(rt, fw.instance_eval{ @rottime })
-    # 何かを書き込むとローテーションが発生する
+    # When something write, rotation is occured
     fw.write('roma',1,"key","val")
     assert(File.exist?("#{path}/1.wb"))
-    # テストは日をまたがないので rottime は元に戻る
+    # rottime turn back because of test shold not step over the day.
     assert_equal(rt, fw.instance_eval{ @rottime })
   end
 
-  # 外部からローテーションするテスト
+  # rotation test from outside
   def test_wb_rotation3
     system('rm -rf wb_test')
     fw = Roma::WriteBehind::FileWriter.new("wb_test", 1024 * 1024, Logger.new(nil))
     path = "wb_test/roma0_11211/roma/#{Time.now.strftime('%Y%m%d')}/"
 
-    # ファイルはない
+    # confirming file don't exist
     assert(!File.exist?("#{path}/0.wb"))
     10.times{|i|
       fw.write('roma',i,"key-#{i}","val-#{i}")
     }
-    # ファイルは1つ
+    # confirming file is only 1 not over 2
     assert(File.exist?("#{path}/0.wb"))
     assert(!File.exist?("#{path}/1.wb"))
 
@@ -131,23 +130,23 @@ class FileWriterTest < Test::Unit::TestCase
     10.times{|i|
       fw.write('roma',i,"key-#{i}","val-#{i}")
     }
-    # ファイルは2つ
+    # confirming files are 2 not over 3
     assert(File.exist?("#{path}/0.wb"))
     assert(File.exist?("#{path}/1.wb"))
     assert(!File.exist?("#{path}/2.wb"))
 
-    # ローテーションの重複呼び出し
+    # test of do rotation continuously
     fw.rotate('roma')
     fw.rotate('roma')
     fw.rotate('roma')
-    # ファイルは2つで変化なし
+    # confimring file's count are still 2 (not changing).
     assert(File.exist?("#{path}/0.wb"))
     assert(File.exist?("#{path}/1.wb"))
     assert(!File.exist?("#{path}/2.wb"))
     10.times{|i|
       fw.write('roma',i,"key-#{i}","val-#{i}")
     }
-    # ファイルは3つ
+    # confirming files are 3 not over 4
     assert(File.exist?("#{path}/0.wb"))
     assert(File.exist?("#{path}/1.wb"))
     assert(File.exist?("#{path}/2.wb"))
@@ -162,7 +161,7 @@ class FileWriterTest < Test::Unit::TestCase
     assert_nil( fw.get_current_file_path('roma') )
 
     fw.write('roma',0,"key","val")
-    
+
     path = File.expand_path("./wb_test/roma0_11211/roma/#{Time.now.strftime('%Y%m%d')}/")
     assert_equal(  File.join(path,"0.wb"), fw.get_current_file_path('roma'))
 
@@ -232,7 +231,7 @@ class WriteBehindTest < FileWriterTest
     send_cmd("localhost_11211", "wb_command_map {:set=>1}")
     assert_equal("STORED", @rc.set("abc","value abc",0,true))
     send_cmd("localhost_11211", "writebehind_rotate roma")
-    
+
     wb0 = read_wb("#{wb_path}/0.wb")
     assert_equal(1, wb0.length)
     wb0.each do |last, cmd, key, val|
@@ -259,8 +258,8 @@ class WriteBehindTest < FileWriterTest
     assert_equal(128, @rc.decr("abc"))
     ## test for set_expt TODO
     send_cmd("localhost_11211", "writebehind_rotate roma")
-    
-    
+
+
     res = {1=>'1',2=>'1',3=>'1',4=>'2',5=>'23',6=>'123',7=>'128',8=>'129',9=>'128'}
     wb0 = read_wb("#{wb_path}/0.wb")
     assert_equal(9, wb0.length)
@@ -307,7 +306,7 @@ class WriteBehindTest < FileWriterTest
     assert_equal('DELETED', @rc.alist_delete_at("abc",1)) #['13','5','4','2','1','8','9','10','12']
     assert_equal('CLEARED', @rc.alist_clear("abc"))
     send_cmd("localhost_11211", "writebehind_rotate roma")
-    
+
     res = {
       10=>'1',4=>'2',5=>'3',6=>'4',7=>'5',8=>'6',9=>'7',11=>'8',12=>'9',
       13=>'10',14=>'11',15=>'12',16=>'13',2=>'3',3=>'6',
@@ -336,7 +335,7 @@ class WriteBehindTest < FileWriterTest
     assert_equal('STORED', @rc.map_set('abc','mapkey1','value1'))
     assert_equal('CLEARED', @rc.map_clear("abc"))
     send_cmd("localhost_11211", "writebehind_rotate roma")
-    
+
     res = {1=>'value1',2=>{},3=>{}}
     wb0 = read_wb("#{wb_path}/0.wb")
     assert_equal(4, wb0.length)

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: roma
 version: !ruby/object:Gem::Version
-  version: 0.8.12
-  prerelease: 
+  version: 0.8.13p1
+  prerelease: 6
 platform: ruby
 authors:
 - Junji Torii
@@ -10,14 +10,14 @@ authors:
 autorequire: 
 bindir: ruby/server/bin
 cert_chain: []
-date: 2013-02-12 00:00:00.000000000 Z
+date: 2014-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
@@ -25,37 +25,39 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: |2
-      ROMA server
+description: ! '    ROMA server
+
+'
 email: 
 executables:
-- multi_commander
-- mkroute
+- recoverlost
 - chg_redundancy
-- recoverlost_alist_all
-- ssroute
+- mkroute
+- simple_bench
+- romad
 - recoverlost_alist
+- ssroute
+- mkconfig
 - roma_watcher
-- recoverlost
-- romad
-- key_list
-- key_access
-- recoverlost_alist_keys
 - mkrecent
-- mkconfig
 - log_merger
 - tribunus
-- simple_bench
+- key_list
 - test-scenario
+- recoverlost_alist_keys
+- key_access
+- multi_commander
+- recoverlost_alist_all
 extensions: []
 extra_rdoc_files:
 - README
 - CHANGELOG
 files:
 - CHANGELOG
+- Gemfile
 - LICENSE
 - README
 - Rakefile
@@ -91,6 +93,7 @@ files:
 - ruby/server/lib/roma/command/vn_command_receiver.rb
 - ruby/server/lib/roma/command_plugin.rb
 - ruby/server/lib/roma/config.rb
+- ruby/server/lib/roma/dns_cache.rb
 - ruby/server/lib/roma/event/con_pool.rb
 - ruby/server/lib/roma/event/handler.rb
 - ruby/server/lib/roma/logging/rlogger.rb
@@ -105,6 +108,7 @@ files:
 - ruby/server/lib/roma/romad.rb
 - ruby/server/lib/roma/routing/cb_rttable.rb
 - ruby/server/lib/roma/routing/merkle_tree.rb
+- ruby/server/lib/roma/routing/random_balancer.rb
 - ruby/server/lib/roma/routing/random_partitioner.rb
 - ruby/server/lib/roma/routing/routing_data.rb
 - ruby/server/lib/roma/routing/rttable.rb
@@ -174,18 +178,15 @@ require_paths:
 required_ruby_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1424416730039994284
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25