roma 0.8.2 → 0.8.10

data/{LICENSE.rdoc → LICENSE}

@@ -1,4 +1,3 @@
-= LICENSE
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 

data/README

@@ -0,0 +1,17 @@
+================================================================
+ ROMA: A Distributed Key-Value Store in Ruby
+ Copyright (C) 2009 Rakuten, Inc. 
+================================================================
+
+ROMA is one of the data storing systems for distributed key-value
+stores. It is a completely decentralized distributed system that
+consists of multiple processes, called nodes, on several machines. It
+is based on pure P2P architecture like a distributed hash table, thus
+it provides high availability and scalability.
+
+ROMA is written in Ruby. However, following choices are available to
+access to ROMA.
+
+* Client libraries of Ruby and Java are available.
+* ROMA protocol is compatible with memcached text-based one so that 
+  any memcached client libraries allows users to interact with ROMA. 

data/Rakefile

@@ -1,31 +1,44 @@
 # -*- coding: utf-8 -*-
 require 'rubygems'
 require 'rake'
-require 'rake/gempackagetask'
-require 'rake/rdoctask'
+
+begin
+  require 'rubygems/package_task'
+  PackageTask = Gem::PackageTask
+rescue LoadError
+  require 'rake/gempackagetask'
+  PackageTask = Rake::GemPackageTask
+end
+
+begin
+  require 'rdoc/task'
+rescue LoadError
+  require 'rake/rdoctask'
+end
 
 RDOC_OPTIONS = [
                 '--line-numbers',
                 '--inline-source',
-                "--main", "README.rdoc",
+                "--main", "README",
                 "-c UTF-8",
                ]
 
 # gem tasks
+base = 'ruby/server/'
 PKG_FILES = FileList[
   '[A-Z]*',
-  'bin/**/*',
-  'lib/**/*.rb',
-  'test/**/*.rb',
-  'spec/**/*.rb',
-  'doc/**/*',
-  'examples/**/*',
+  base + 'bin/**/*',
+  base + 'lib/**/*',
+  base + 'test/**/*.rb',
+  base + 'spec/**/*.rb',
+  base + 'doc/**/*',
+  base + 'examples/**/*',
 ]
 
-EXEC_TABLE = Dir.entries('bin').reject{ |d| d =~ /^\.+$/ || d =~ /^sample_/ }
-
+EXEC_TABLE = Dir.entries(base + 'bin').reject{ |d| d =~ /^\.+$/ || d =~ /^sample_/ }
 
-VER_NUM = `ruby -Ilib -e 'require "roma/version"; puts Roma::VERSION'`
+require File.expand_path(File.join('ruby', 'server', 'lib', 'roma', 'version'), File.dirname(__FILE__))
+VER_NUM = Roma::VERSION
 
 if VER_NUM =~ /([0-9.]+)$/
   CURRENT_VERSION = $1
@@ -34,6 +47,8 @@ else
 end
 
 SPEC = Gem::Specification.new do |s|
+  s.authors = ["Junji Torii", "Hiroki Matsue"]
+  s.homepage = 'http://code.google.com/p/roma-prj/'
   s.name = "roma"
   s.version = CURRENT_VERSION
   s.summary = "ROMA server"
@@ -43,21 +58,21 @@ SPEC = Gem::Specification.new do |s|
   s.files = PKG_FILES.to_a
 
   # Use these for libraries.
-  s.require_path = 'lib'
+  s.require_path = base + 'lib'
 
   # Use these for applications.
-  s.bindir = "bin"
+  s.bindir = base + "bin"
   s.executables = EXEC_TABLE
   s.default_executable = "romad"
 
   s.has_rdoc = true
   s.rdoc_options.concat RDOC_OPTIONS
-  s.extra_rdoc_files = ["README.rdoc"]
+  s.extra_rdoc_files = ["README", "CHANGELOG"]
 
-  s.add_dependency('roma-commons')
+  s.add_dependency('eventmachine')
 end
 
-package_task = Rake::GemPackageTask.new(SPEC) do |pkg|
+package_task = PackageTask.new(SPEC) do |pkg|
 end
 
 
@@ -66,5 +81,5 @@ Rake::RDocTask.new("doc") { |rdoc|
   rdoc.title = "ROMA documents"
   rdoc.options.concat RDOC_OPTIONS
   rdoc.rdoc_files.include('lib/**/*.rb')
-  rdoc.rdoc_files.include("README.rdoc")
+  rdoc.rdoc_files.include("README")
 }

data/ruby/server/bin/chg_redundancy

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+require 'pathname'
+
+base_path = Pathname(__FILE__).dirname.parent.parent.expand_path
+$LOAD_PATH.unshift("#{base_path}/server/lib")
+
+client_base_path = Pathname(__FILE__).dirname.parent.parent.parent.parent.expand_path
+$LOAD_PATH.unshift("#{client_base_path}/roma-ruby-client/lib")
+
+require 'roma/tools/chg_redundancy'

data/ruby/server/bin/key_access

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+require 'pathname'
+
+base_path = Pathname(__FILE__).dirname.parent.parent.expand_path
+$LOAD_PATH.unshift("#{base_path}/server/lib")
+
+require 'roma/tools/key_access'

data/ruby/server/bin/key_list

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+require 'pathname'
+
+base_path = Pathname(__FILE__).dirname.parent.parent.expand_path
+$LOAD_PATH.unshift("#{base_path}/server/lib")
+
+require 'roma/tools/key_list'

data/ruby/server/bin/mkconfig

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+
+$:.unshift(File.expand_path(File.join('..', 'lib'), File.dirname(__FILE__)))
+
+require 'optparse'
+require 'roma/tools/mkconfig'
+
+opt = OptionParser.new
+opt.on("-m","--with_menu", "Show menu to setup configurations individually.") { |v| Roma::Mkconfig.new(:with_menu)}
+
+if ARGV.count == 0
+  Roma::Mkconfig.new
+elsif
+  begin
+    opt.parse!(ARGV)
+  rescue OptionParser::InvalidOption
+    puts opt.help
+  end
+end

data/{bin → ruby/server/bin}/mkrecent

@@ -2,6 +2,5 @@
 
 path =  File.dirname(File.expand_path($PROGRAM_NAME))
 $LOAD_PATH << path + "/../lib"
-$LOAD_PATH << path  + "/../../commons/lib"
 
 require 'roma/tools/mkrecent'

data/{bin → ruby/server/bin}/mkroute

@@ -2,6 +2,5 @@
 
 path =  File.dirname(File.expand_path($PROGRAM_NAME))
 $LOAD_PATH << path + "/../lib"
-$LOAD_PATH << path  + "/../../commons/lib"
 
 require 'roma/tools/mkroute'

data/ruby/server/bin/multi_commander

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+require 'pathname'
+
+base_path = Pathname(__FILE__).dirname.parent.parent.expand_path
+$LOAD_PATH.unshift("#{base_path}/server/lib")
+
+client_base_path = Pathname(__FILE__).dirname.parent.parent.parent.parent.expand_path
+$LOAD_PATH.unshift("#{client_base_path}/roma-ruby-client/lib")
+
+require 'roma/tools/multi_commander'
+
+if ARGV.length < 2
+  STDERR.puts "usage:#{File.basename($0)} addr_port command args..."
+  exit
+end
+
+w = Roma::MultiCommander.new(ARGV[0])
+STDOUT.puts w.send_cmd_all(ARGV[1..-1].join(' '))
+

data/ruby/server/bin/recoverlost

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+require 'pathname'
+
+base_path = Pathname(__FILE__).dirname.parent.parent.expand_path
+$LOAD_PATH.unshift("#{base_path}/server/lib")
+
+client_base_path = Pathname(__FILE__).dirname.parent.parent.parent.parent.expand_path
+$LOAD_PATH.unshift("#{client_base_path}/roma-ruby-client/lib")
+
+require 'roma/tools/recoverlost'

data/ruby/server/bin/recoverlost_alist

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+require 'pathname'
+
+base_path = Pathname(__FILE__).dirname.parent.parent.expand_path
+$LOAD_PATH.unshift("#{base_path}/server/lib")
+
+client_base_path = Pathname(__FILE__).dirname.parent.parent.parent.parent.expand_path
+$LOAD_PATH.unshift("#{client_base_path}/roma-ruby-client/lib")
+
+require 'roma/tools/recoverlost_alist'

data/ruby/server/bin/recoverlost_alist_all

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+require 'pathname'
+
+base_path = Pathname(__FILE__).dirname.parent.parent.expand_path
+$LOAD_PATH.unshift("#{base_path}/server/lib")
+
+client_base_path = Pathname(__FILE__).dirname.parent.parent.parent.parent.expand_path
+$LOAD_PATH.unshift("#{client_base_path}/roma-ruby-client/lib")
+
+require 'roma/tools/recoverlost_alist_all'

data/ruby/server/bin/recoverlost_alist_keys

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+require 'pathname'
+
+base_path = Pathname(__FILE__).dirname.parent.parent.expand_path
+$LOAD_PATH.unshift("#{base_path}/server/lib")
+
+client_base_path = Pathname(__FILE__).dirname.parent.parent.parent.parent.expand_path
+$LOAD_PATH.unshift("#{client_base_path}/roma-ruby-client/lib")
+
+require 'roma/tools/recoverlost_alist_keys'

data/{bin/recoverlost → ruby/server/bin/roma_watcher}

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

data/ruby/server/bin/romad

@@ -0,0 +1,36 @@
+#!/usr/bin/env ruby
+
+path =  File.dirname(File.expand_path($PROGRAM_NAME))
+$LOAD_PATH << path + "/../lib"
+
+require 'roma/romad'
+
+def daemonize
+  p = Process.fork {
+    pid=Process.setsid
+    Signal.trap(:INT){
+      exit! 0
+    }
+    Signal.trap(:TERM){
+      exit! 0       
+    }
+    Signal.trap(:HUP){
+      exit! 0
+    }
+    File.open("/dev/null","r+"){|f|
+      STDIN.reopen f
+      STDOUT.reopen f
+      STDERR.reopen f
+    }
+    yield
+  }
+  $stderr.puts p
+  exit! 0
+end
+
+$roma = Roma::Romad.new(ARGV)
+if $roma.daemon?
+  daemonize{ $roma.start }
+else
+  $roma.start
+end

data/{bin → ruby/server/bin}/sample_watcher

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

data/{bin → ruby/server/bin}/sample_watcher2

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

data/{bin/simple_bench → ruby/server/bin/sample_watcher3}

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

data/ruby/server/bin/simple_bench

@@ -0,0 +1,26 @@
+#!/usr/bin/env ruby
+require 'pathname'
+
+base_path = Pathname(__FILE__).dirname.parent.parent.expand_path
+$LOAD_PATH.unshift("#{base_path}/server/lib")
+
+client_base_path = Pathname(__FILE__).dirname.parent.parent.parent.parent.expand_path
+$LOAD_PATH.unshift("#{client_base_path}/roma-ruby-client/lib")
+
+require 'roma/tools/simple_bench'
+
+if ARGV.length == 0
+  STDERR.puts "usage:simple_bench addr:port"
+  exit
+end
+
+tn=10
+t=[]
+tn.times{
+  t << Thread.new{
+    random_rquest_sender(ARGV)
+  }
+}
+
+t[0].join
+

data/{bin → ruby/server/bin}/ssroute

@@ -2,6 +2,5 @@
 
 path =  File.dirname(File.expand_path($PROGRAM_NAME))
 $LOAD_PATH << path + "/../lib"
-$LOAD_PATH << path  + "/../../commons/lib"
 
 require 'roma/tools/ssroute'

data/ruby/server/bin/test-scenario

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+require 'pathname'
+
+base_path = Pathname(__FILE__).dirname.parent.parent.expand_path
+$LOAD_PATH.unshift("#{base_path}/server/lib")
+
+client_base_path = Pathname(__FILE__).dirname.parent.parent.parent.parent.expand_path
+$LOAD_PATH.unshift("#{client_base_path}/roma-ruby-client/lib")
+
+require 'roma/tools/test-scenario'
+

data/{bin → ruby/server/bin}/tribunus

@@ -2,6 +2,5 @@
 
 path =  File.dirname(File.expand_path($PROGRAM_NAME))
 $LOAD_PATH << path + "/../lib"
-$LOAD_PATH << path  + "/../../commons/lib"
 
 require 'roma/tools/tribunus'

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

@@ -1,3 +1,4 @@
+
 # -*- coding: utf-8 -*-
 require 'thread'
 require 'digest/sha1'
@@ -43,6 +44,7 @@ module Roma
       @async_thread = Thread.new{
         async_process_loop
       }
+      @async_thread[:name] = __method__
     rescue =>e
       @log.error("#{e}\n#{$@}")
     end
@@ -65,11 +67,12 @@ module Roma
             msg.callback.call(msg,true) if msg.callback
           else
             if msg.retry?
-              Thread.new{
+              t = Thread.new{
                 msg.wait
                 msg.incr_count
                 @@async_queue.push(msg)
               }
+              t[:name] = __method__
             else
               @log.error("async process retry out:#{msg.inspect}")
               msg.callback.call(msg,false) if msg.callback
@@ -85,9 +88,10 @@ module Roma
     def asyncev_broadcast_cmd(args)
       @log.debug("asyncev_broadcast_cmd #{args.inspect}")
       cmd, nids, tout = args
-      Thread::new{
+      t = Thread::new{
         async_broadcast_cmd("#{cmd}\r\n", nids, tout)
       }
+      t[:name] = __method__
       true
     end
 
@@ -98,7 +102,7 @@ module Roma
         return true
       end
       @stats.run_acquire_vnodes = true
-      Thread::new{
+      t = Thread::new{
         begin
           acquire_vnodes_process
         rescue =>e
@@ -108,6 +112,7 @@ module Roma
           @stats.join_ap = nil
         end
       }
+      t[:name] = __method__
       true
     end
 
@@ -115,7 +120,7 @@ module Roma
       @log.debug("asyncev_start_dumpfile_process #{args.inspect}")
       key, path, cmd = args
       path = Roma::Config::STORAGE_DUMP_PATH + '/' + path
-      Thread.new{
+      t = Thread.new{
         begin
           except_vnh = {}
           @rttable.each_vnode{|vn,nids|
@@ -138,6 +143,7 @@ module Roma
           @log.error("#{e}\n#{$@}")
         end
       }
+      t[:name] = __method__
       true
     end
 
@@ -176,7 +182,7 @@ module Roma
         return true # no retry
       end
       res = async_send_cmd(nid,"rset #{k}\e#{hname} #{d} #{clk} #{expt} #{v.length}\r\n#{v}\r\n",10)
-      unless res
+      if res == nil || res.start_with?("ERROR")
         @log.warn("async redundant failed:#{k}\e#{hname} #{d} #{clk} #{expt} #{v.length} -> #{nid}")
         return false # retry
       end
@@ -191,27 +197,43 @@ module Roma
         return true # no retry
       end
       res = async_send_cmd(nid,"rzset #{k}\e#{hname} #{d} #{clk} #{expt} #{zv.length}\r\n#{zv}\r\n",10)
-      unless res
+      if res == nil || res.start_with?("ERROR")
         @log.warn("async zredundant failed:#{k}\e#{hname} #{d} #{clk} #{expt} #{v.length} -> #{nid}")
         return false # retry
       end
       true
     end
 
+    def asyncev_rdelete(args)
+      nid,hname,k,clk = args
+      @log.debug("asyncev_rdelete #{args.inspect}")
+      unless @rttable.nodes.include?(nid)
+        @log.warn("async rdelete failed:#{nid} dose not found in routing table.#{k}\e#{hname} #{clk}")
+        return true # no retry
+      end
+      res = async_send_cmd(nid,"rdelete #{k}\e#{hname} #{clk}\r\n",10)
+      unless res
+        @log.warn("async redundant failed:#{k}\e#{hname} #{clk} -> #{nid}")
+        return false # retry
+      end
+      true      
+    end
+
     def asyncev_reqpushv(args)
       vn, nid, p = args
       @log.debug("asyncev_reqpushv #{args.inspect}")
-      Thread::new{
+      t = Thread::new{
         sync_a_vnode(vn.to_i, nid, p == 'true')
       }
+      t[:name] = __method__
     end
 
     def asyncev_start_recover_process(args)
       @log.debug("asyncev_start_recover_process #{args.inspect}")
       @stats.run_recover = true
-      Thread::new{
+      t = Thread::new{
         begin
-          if args != nil
+          if args == nil || args.length == 0
             acquired_recover_process
           elsif args[0] == '-s'
             recover_process
@@ -225,12 +247,13 @@ module Roma
         end
         @stats.run_recover = false
       }
+      t[:name] = __method__
     end
 
     def asyncev_start_release_process(args)
       @log.debug("asyncev_start_release_process #{args}")
       @stats.run_release = true
-      Thread::new{
+      t = Thread::new{
         begin
           release_process
         rescue => e
@@ -238,15 +261,17 @@ module Roma
         end
         @stats.run_relase = false
       }
+      t[:name] = __method__
     end
 
     def asyncev_start_sync_process(args)
       @log.debug("asyncev_start_sync_process")
       @stats.run_recover = true
-      Thread::new{
+      t = Thread::new{
         sync_process(args)
         @stats.run_recover = false
       }
+      t[:name] = __method__
     end
 
     def sync_process(st)
@@ -354,9 +379,13 @@ module Roma
     def req_push_a_vnode(vn, src_nid, is_primary)
       con = Roma::Messaging::ConPool.instance.get_connection(src_nid)
       con.write("reqpushv #{vn} #{@stats.ap_str} #{is_primary}\r\n")
-      res = con.gets # receive 'PUSHED\r\n' | 'REJECTED\r\n'
+      res = con.gets # receive 'PUSHED\r\n' | 'REJECTED\r\n' | 'ERROR\r\n'
       if res == "REJECTED\r\n"
         @log.warn("req_push_a_vnode:request was rejected from #{src_nid}.")
+        Roma::Messaging::ConPool.instance.return_connection(src_nid,con)
+        return :rejected
+      elsif res.start_with?("ERROR")
+        @log.warn("req_push_a_vnode:#{src_nid} busy.")
         return :rejected
       end
       Roma::Messaging::ConPool.instance.return_connection(src_nid,con)
@@ -606,9 +635,24 @@ module Roma
  
     def push_a_vnode_stream(hname, vn, nid)
       @stats.run_iterate_storage = true
-      @log.info("push_a_vnode_stream:hname=#{hname} vn=#{vn} nid=#{nid}")
+      @log.info("#{__method__}:hname=#{hname} vn=#{vn} nid=#{nid}")
+
+      while(@stats.run_storage_clean_up)
+        @log.info("#{__method__}:stop clean up storage process")
+        @storages.each_value{|st| st.stop_clean_up}
+        sleep 0.1
+      end
+
       con = Roma::Messaging::ConPool.instance.get_connection(nid)
 
+      @do_push_a_vnode_stream = true
+      
+      while(@stats.run_storage_clean_up)
+        @log.info("#{__method__}:stop_clean_up")
+        @storages.each_value{|st| st.stop_clean_up}
+        sleep 0.5
+      end
+
       con.write("spushv #{hname} #{vn}\r\n")
 
       res = con.gets # READY\r\n or error string
@@ -618,6 +662,13 @@ module Roma
       end
 
       @storages[hname].each_vn_dump(vn){|data|
+
+        unless @do_push_a_vnode_stream
+          con.close
+          @log.error("#{__method__}:canceled in hname=#{hname} vn=#{vn} nid=#{nid}")
+          return "CANCELED"
+        end
+
         @stats.run_iterate_storage = true
         con.write(data)
         sleep @stats.stream_copy_wait_param
@@ -643,7 +694,7 @@ module Roma
         return
       end
       @stats.run_storage_clean_up = true
-      Thread::new{
+      t = Thread::new{
         begin
           storage_clean_up_process
         rescue =>e
@@ -652,6 +703,7 @@ module Roma
           @stats.run_storage_clean_up = false
         end
       }
+      t[:name] = __method__
     end
 
     def storage_clean_up_process
@@ -675,7 +727,7 @@ module Roma
           @stats.out_count += 1
 #          @log.debug("#{__method__}:key=#{key} vn=#{vn}")
           nodes = @rttable.search_nodes_for_write(vn)
-          next if(nodes.length <= 1)
+          next if(nodes == nil || nodes.length <= 1)
           nodes[1..-1].each{|nid|
             res = async_send_cmd(nid,"out #{key}\e#{hname} #{vn}\r\n")
             unless res