tengine_core 0.5.36 → 0.5.37

data/VERSION

@@ -1 +1 @@
-0.5.36
+0.5.37

data/lib/tengine/core/event.rb

@@ -70,10 +70,11 @@ class Tengine::Core::Event
   # @yieldparam  [Tengine::Core::Event] event          The event in question.
   # @yieldreturn              [Boolean]                Return false, and it will just break the execution.  Otherwise, it tries to update the event.
   # @param                       [Hash] condition      Criteria to find a document.
-  # @param                    [Numeric] retry_max (3)  Maximum number of retry attempts to save the event.
+  # @param                    [Numeric] retry_max (60)  Maximum number of retry attempts to save the event.
+  # @param                    [Numeric] wtimeout  (10240)  Write timeout, ignored for earlier mongodb.
   # @return      [Tengine::Core::Event]                The event in question if update succeeded, false if retry_max reached, or nil if the block exited with false.
   # @raise    [Mongo::OperationFailure]                Any exceptions that happened inside will be propagated outside.
-  def self.find_or_create_then_update_with_block condition, retry_max = 3
+  def self.find_or_create_then_update_with_block condition, retry_max = 60, wtimeout = 10240
     # * とある条件を満たすイベントがあれば、それを上書きしたい。
     # * なければ、新規作成したい。
     # * でもアトミックにやりたい。
@@ -86,7 +87,7 @@ class Tengine::Core::Event
     results = nil
 
     case collection.driver.db.connection when Mongo::ReplSetConnection then
-      safemode = { :w => "majority", :wtimeout => 1024, } # mongodb 2.0+, 参加しているレプリカセットの多数派に書き込んだ時点でOK扱い
+      safemode = { :w => "majority", :wtimeout => wtimeout, } # mongodb 2.0+, 参加しているレプリカセットの多数派に書き込んだ時点でOK扱い
     else
       safemode = true
     end

data/lib/tengine/core/kernel.rb

@@ -181,7 +181,15 @@ class Tengine::Core::Kernel
       unless event
         # Model.exists?だと上手くいかない時があるのでModel.whereを使っています
         # fire_failed_event(raw_event) if Tengine::Core::Event.exists?(confitions: { key: raw_event.key, sender_name: raw_event.sender_name })
-        if Tengine::Core::Event.where(:key => raw_event.key, :sender_name => raw_event.sender_name).count > 0
+
+        begin
+          n = Tengine::Core::Event.where(:key => raw_event.key, :sender_name => raw_event.sender_name).count
+        rescue Mongo::ConnectionFailure, Mongo::OperationTimeout, Mongo::OperationFailure => e
+          Tengine.logger.error("giving up processing an event due to #{e} (#{e.class.name})")
+          n = 0
+        end
+
+        if n > 0
           fire_failed_event(raw_event)
           headers.ack
         else
@@ -192,18 +200,24 @@ class Tengine::Core::Kernel
       end
       event.kernel = self
 
-      ack_policy = ack_policy_for(event)
-      safety_processing_headers(headers, event, ack_policy) do
-        ack if ack_policy == :at_first
-        handlers = find_handlers(event)
-        safty_handlers(handlers) do
-          delegate(event, handlers)
-          ack if all_submitted?
+      begin
+        ack_policy = ack_policy_for(event)
+        safety_processing_headers(headers, event, ack_policy) do
+          ack if ack_policy == :at_first
+          handlers = find_handlers(event)
+          safty_handlers(handlers) do
+            delegate(event, handlers)
+            ack if all_submitted?
+          end
+          headers.reject(:requeue => true) unless ack?
         end
-        headers.reject(:requeue => true) unless ack?
+        close_if_shutting_down
+        true
+      rescue Mongo::ConnectionFailure, Mongo::OperationTimeout, Mongo::OperationFailure => e
+        Tengine.logger.error("giving up processing an event due to #{e} (#{e.class.name})")
+        Tengine.logger.info("requeue an event #{raw_event.inspect}")
+        headers.reject(:requeue => true)
       end
-      close_if_shutting_down
-      true
     end
   end
 

data/lib/tengine/core/mongoid_fix.rb

@@ -15,22 +15,24 @@ if Mongoid::VERSION < "3.0.0"
         end
       end
     end
+  end
 
+  module Mongoid::Collections::Retry
     # https://github.com/mongoid/mongoid/pull/1739
+    # Mongoid 2.3.x needs additional fix
     def retry_on_connection_failure
       retries = 0
       begin
         yield
-      rescue Mongo::ConnectionFailure, Mongo::OperationTimeout => ex
-        retries = increase_retry_attempts(retries, ex)
+      rescue Mongo::ConnectionFailure, Mongo::OperationTimeout, Mongo::OperationFailure => ex
+        raise unless ex.class == Mongo::OperationFailure and ex.message !~ /not master/
+
+        retries += 1
+        raise if retries > Mongoid.max_retries_on_connection_failure
+
+        Kernel.sleep(0.5)
+        log_retry retries
         retry
-      rescue Mongo::OperationFailure => ex
-        if ex.message =~ /not master/
-          retries = increase_retry_attempts(retries, ex)
-          retry
-        else
-          raise ex
-        end
       end
     end
   end

data/spec/tengine/core/mutex_spec.rb

@@ -80,7 +80,7 @@ describe Tengine::Core::Mutex do
       t1 = Time.now
       block_called.should be_true
       m.reload.waiters.should be_empty
-      (t1 - t0).should be_within(0.5).of(0.3 + m.ttl)
+      (t1 - t0).should be_within(1.0).of(0.3 + m.ttl)
     end
 
     it "synchronizes #3: with another locker, which is not expiring" do
@@ -106,7 +106,7 @@ describe Tengine::Core::Mutex do
       t1 = Time.now
       block_called.should be_true
       m.reload.waiters.should be_empty
-      (t1 - t0).should be_within(0.5).of(5 + m.ttl)
+      (t1 - t0).should be_within(1.0).of(5 + m.ttl)
     end
 
     it "synchronizes #4: multi-threaded situation" do
@@ -178,7 +178,7 @@ describe Tengine::Core::Mutex do
       end
 
       t1.should_not be_nil
-      (t1 - t0).should be_within(0.5).of(10 * subject.mutex.ttl)
+      (t1 - t0).should be_within(1.0).of(10 * subject.mutex.ttl)
     end
   end
 end

data/tengine_core.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "tengine_core"
-  s.version = "0.5.36"
+  s.version = "0.5.37"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["taigou", "totty", "g-morita", "shyouhei", "akm", "hiroshinakao"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tengine_core
 version: !ruby/object:Gem::Version
-  version: 0.5.36
+  version: 0.5.37
   prerelease: 
 platform: ruby
 authors:
@@ -18,7 +18,7 @@ date: 2012-02-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70364269012360 !ruby/object:Gem::Requirement
+  requirement: &70303062943180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -26,10 +26,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70364269012360
+  version_requirements: *70303062943180
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70364269011880 !ruby/object:Gem::Requirement
+  requirement: &70303062942700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -37,10 +37,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70364269011880
+  version_requirements: *70303062942700
 - !ruby/object:Gem::Dependency
   name: selectable_attr
-  requirement: &70364269011400 !ruby/object:Gem::Requirement
+  requirement: &70303062942220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -48,10 +48,10 @@ dependencies:
         version: 0.3.15
   type: :runtime
   prerelease: false
-  version_requirements: *70364269011400
+  version_requirements: *70303062942220
 - !ruby/object:Gem::Dependency
   name: bson
-  requirement: &70364269005160 !ruby/object:Gem::Requirement
+  requirement: &70303062941740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -59,10 +59,10 @@ dependencies:
         version: 1.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *70364269005160
+  version_requirements: *70303062941740
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70364269004560 !ruby/object:Gem::Requirement
+  requirement: &70303062941260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -70,10 +70,10 @@ dependencies:
         version: 1.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *70364269004560
+  version_requirements: *70303062941260
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &70364269003980 !ruby/object:Gem::Requirement
+  requirement: &70303062940780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -81,10 +81,10 @@ dependencies:
         version: 1.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *70364269003980
+  version_requirements: *70303062940780
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70364269003460 !ruby/object:Gem::Requirement
+  requirement: &70303062940300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -92,10 +92,10 @@ dependencies:
         version: 2.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *70364269003460
+  version_requirements: *70303062940300
 - !ruby/object:Gem::Dependency
   name: tengine_support
-  requirement: &70364269002860 !ruby/object:Gem::Requirement
+  requirement: &70303062939820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -103,10 +103,10 @@ dependencies:
         version: 0.3.12
   type: :runtime
   prerelease: false
-  version_requirements: *70364269002860
+  version_requirements: *70303062939820
 - !ruby/object:Gem::Dependency
   name: tengine_event
-  requirement: &70364269002200 !ruby/object:Gem::Requirement
+  requirement: &70303062939340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -114,10 +114,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70364269002200
+  version_requirements: *70303062939340
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &70364269001540 !ruby/object:Gem::Requirement
+  requirement: &70303062955240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -125,10 +125,10 @@ dependencies:
         version: 1.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70364269001540
+  version_requirements: *70303062955240
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70364269000960 !ruby/object:Gem::Requirement
+  requirement: &70303062954760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -136,10 +136,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70364269000960
+  version_requirements: *70303062954760
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70364269000440 !ruby/object:Gem::Requirement
+  requirement: &70303062954280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -147,10 +147,10 @@ dependencies:
         version: 2.1.2
   type: :development
   prerelease: false
-  version_requirements: *70364269000440
+  version_requirements: *70303062954280
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70364268999840 !ruby/object:Gem::Requirement
+  requirement: &70303062953800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -158,10 +158,10 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *70364268999840
+  version_requirements: *70303062953800
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70364268999260 !ruby/object:Gem::Requirement
+  requirement: &70303062953320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -169,10 +169,10 @@ dependencies:
         version: 1.0.18
   type: :development
   prerelease: false
-  version_requirements: *70364268999260
+  version_requirements: *70303062953320
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70364268998660 !ruby/object:Gem::Requirement
+  requirement: &70303062952840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -180,10 +180,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70364268998660
+  version_requirements: *70303062952840
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70364268998100 !ruby/object:Gem::Requirement
+  requirement: &70303062952360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -191,10 +191,10 @@ dependencies:
         version: 0.5.3
   type: :development
   prerelease: false
-  version_requirements: *70364268998100
+  version_requirements: *70303062952360
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &70364268997540 !ruby/object:Gem::Requirement
+  requirement: &70303062951880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -202,10 +202,10 @@ dependencies:
         version: 4.6.2
   type: :development
   prerelease: false
-  version_requirements: *70364268997540
+  version_requirements: *70303062951880
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70364268989600 !ruby/object:Gem::Requirement
+  requirement: &70303062951400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -213,10 +213,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70364268989600
+  version_requirements: *70303062951400
 - !ruby/object:Gem::Dependency
   name: kramdown
-  requirement: &70364268989000 !ruby/object:Gem::Requirement
+  requirement: &70303062950920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -224,7 +224,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70364268989000
+  version_requirements: *70303062950920
 description: tengine_core is a framework/engine to support distributed processing
 email: tengine@nautilus-technologies.com
 executables:
@@ -418,4 +418,3 @@ signing_key:
 specification_version: 3
 summary: tengine_core is a framework/engine to support distributed processing
 test_files: []
-has_rdoc: