roma 0.8.13p1 → 0.8.13

data/CHANGELOG

@@ -1,11 +1,3 @@
-*0.8.13-p1 (Jan 15 2014)*
-
-* add timeout parameter for a vnode copy [junji torii] 0522750
-* remove some debug log [hiroaki-iwase] 94d96dc
-* Add Gemfile. [Hiroki Matsue] 9029bf8
-* Ignore test related files. [Hiroki Matsue] 556a931
-* fix:add rescue in timer_event_1sec [junji torii] 11cc4ea
-
 *0.8.13 (Sep 12 2013)*
 
 * change target ruby version about encoding problem (upper 1.9.2 => upper 1.9.1) [hiroaki-iwase] e56d2f4

data/Rakefile

@@ -39,8 +39,8 @@ EXEC_TABLE = Dir.entries(base + 'bin').reject{ |d| d =~ /^\.+$/ || d =~ /^sample
 require File.expand_path(File.join('ruby', 'server', 'lib', 'roma', 'version'), File.dirname(__FILE__))
 VER_NUM = Roma::VERSION
 
-if VER_NUM =~ /([0-9.p-]+)$/
-  CURRENT_VERSION = $1.delete("-")
+if VER_NUM =~ /([0-9.]+)$/
+  CURRENT_VERSION = $1
 else
   CURRENT_VERSION = "0.0.0"
 end

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

@@ -462,11 +462,11 @@ module Roma
       Roma::Messaging::ConPool.instance.return_connection(src_nid,con)
       # waiting for pushv
       count = 0
-      while @rttable.search_nodes(vn).include?(@stats.ap_str)==false && count < @stats.reqpushv_timeout_count
+      while @rttable.search_nodes(vn).include?(@stats.ap_str)==false && count < 300
         sleep 0.1
         count += 1
       end
-      if count >= @stats.reqpushv_timeout_count
+      if count >= 300
         @log.warn("#{__method__}:request has been time-out.vn=#{vn} nid=#{src_nid}")
         return :timeout
       end

data/ruby/server/lib/roma/command/vn_command_receiver.rb

@@ -45,20 +45,14 @@ module Roma
         count = rcount = 0
         @log.debug("#{__method__}:#{s.inspect} received.")
         loop {
-          context_bin = read_bytes(20, @stats.spushv_read_timeout)
+          context_bin = read_bytes(20, 100)
           vn, last, clk, expt, klen = context_bin.unpack('NNNNN')
           break if klen == 0 # end of dump ?
           k = read_bytes(klen)
-          vlen_bin = read_bytes(4, @stats.spushv_read_timeout)
+          vlen_bin = read_bytes(4, 100)
           vlen, =  vlen_bin.unpack('N')
           if vlen != 0
-            if klen > @stats.spushv_klength_warn
-              @log.warn("#{__method__}:Too long key: key = #{k}")
-            end
-            if vlen > @stats.spushv_vlength_warn
-              @log.warn("#{__method__}:Too long value: key = #{k} vlen = #{vlen}")
-            end
-            v = read_bytes(vlen, @stats.spushv_read_timeout)
+            v = read_bytes(vlen, 100)
 
             createhash(s[1]) unless @storages[s[1]]
             if @storages[s[1]].load_stream_dump(vn, last, clk, expt, k, v)

data/ruby/server/lib/roma/event/handler.rb

@@ -50,15 +50,7 @@ module Roma
         @@connection_expire_time
       end
 
-      @@timeout = 10
-      def self.timeout=(n)
-        @@timeout = n
-      end
-
-      def self.timeout
-        @@timeout
-      end
-
+      attr_accessor :timeout
       attr_reader :connected
       attr_reader :lastcmd
       attr_reader :last_access
@@ -79,6 +71,7 @@ module Roma
 
         @storages = storages
         @rttable = rttable
+        @timeout = 10
         @log = Roma::Logging::RLogger.instance
         @last_access = Time.now
       end
@@ -103,6 +96,7 @@ module Roma
       end
 
       def unbind
+        @log.debug("Roma::Event::Handler.unbind called")
         @connected=false
         begin
           @fiber.resume
@@ -150,7 +144,7 @@ module Roma
 
       def dispatcher
         @stats = Roma::Stats.instance
-        #@log.debug("Roma::Event::Handler.dipatcher called")
+        @log.debug("Roma::Event::Handler.dipatcher called")
         while(@connected) do
           @enter_time = nil
           next unless s=gets
@@ -230,7 +224,7 @@ module Roma
           else
             remain = size - @rbuf.size
             Fiber.yield(remain)
-            if Time.now.to_i - t > @@timeout * mult
+            if Time.now.to_i - t > @timeout * mult
               @log.warn("#{__FILE__}:#{__LINE__}:#{@addr}:#{@port} read_bytes time out");
               close_connection
               return nil

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

@@ -521,8 +521,6 @@ module Roma
           @stats.run_storage_clean_up
         stop_clean_up
       end
-    rescue Exception =>e
-      @log.error("#{e}\n#{$@}")
     end
 
     def timer_event_10sec
@@ -541,7 +539,7 @@ module Roma
         @log.warn("failover disable now!!")
       else
         version_check
-        @rttable.delete_old_trans(@stats.routing_trans_timeout)
+        @rttable.delete_old_trans
         start_sync_routing_process
       end
 

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

@@ -63,14 +63,6 @@ module Roma
     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
@@ -100,11 +92,6 @@ module Roma
       @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
@@ -145,11 +132,6 @@ module Roma
       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/version.rb

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

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: roma
 version: !ruby/object:Gem::Version
-  version: 0.8.13p1
-  prerelease: 6
+  version: 0.8.13
+  prerelease: 
 platform: ruby
 authors:
 - Junji Torii
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: ruby/server/bin
 cert_chain: []
-date: 2014-01-23 00:00:00.000000000 Z
+date: 2013-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -57,7 +57,6 @@ extra_rdoc_files:
 - CHANGELOG
 files:
 - CHANGELOG
-- Gemfile
 - LICENSE
 - README
 - Rakefile
@@ -184,9 +183,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25

data/Gemfile

@@ -1,17 +0,0 @@
-source "https://rubygems.org"
-
-gem 'eventmachine'
-
-# Back-end storages
-group :tokyocabinet do
-  gem 'tokyocabinet', :git => 'https://github.com/roma/tokyocabinet-ruby.git'
-end
-
-group :gdbm do
-  gem 'ffi'
-  gem 'gdbm'
-end
-
-group :sqlite3 do
-  gem 'sqlite3'
-end