tengine_core 0.5.28 → 0.5.30

data/VERSION

@@ -1 +1 @@
-0.5.28
+0.5.30

data/lib/tengine/core/kernel.rb

@@ -196,8 +196,9 @@ class Tengine::Core::Kernel
         handlers = find_handlers(event)
         safty_handlers(handlers) do
           delegate(event, handlers)
-          headers.ack if all_submitted?
+          ack if all_submitted?
         end
+        headers.reject(:requeue => true) unless ack?
       end
       close_if_shutting_down
       true

data/lib/tengine/core/mutex.rb

@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 require 'tengine/core'
 
+require_relative 'safe_updatable'
+
 # Tengine::Core::Mutexは(若干残念な実装の)分散ロック機構です。これを用
 # いることで、とあるMutexをロックしているプロセスを同時にたかだか一つに
 # 制限することが可能になります。
@@ -47,6 +49,7 @@ Tengine::Core::Mutex = Struct.new :mutex, :_id, :recursive
 class Tengine::Core::Mutex::Mutex
 
   include Mongoid::Document
+  include Tengine::Core::SafeUpdatable
 
   field :ttl, :type => Float
   field :waiters, :type => Array
@@ -64,16 +67,12 @@ class Tengine::Core::Mutex::Mutex
 
   # 暫定対応[Bug]mongodbフェールオーバ中にtengine_resource＿watchdが落ちてしまう
   def _update q = {}, r
-    retry_count = 100
-    idx = 1
-    begin
-      self.class.collection.driver.update({ :_id => _id, }.update(q), r, {:safe=>true})
-      reload
-    rescue Mongo::ConnectionFailure => e
-      idx += 1
-      sleep 0.5
-      retry if retry_count > idx
-    end
+    update_in_safe_mode(
+      self.class.collection,
+      { :_id => _id, }.update(q),
+      r
+    )
+    reload
   end
 
   public

data/lib/tengine/core/optimistic_lock.rb

@@ -5,6 +5,7 @@ require 'active_support/core_ext/array/extract_options'
 
 module Tengine::Core::OptimisticLock
   extend ActiveSupport::Concern
+  include Tengine::Core::SafeUpdatable
 
   included do
     cattr_accessor :lock_optimistically, :instance_writer => false
@@ -23,25 +24,25 @@ module Tengine::Core::OptimisticLock
     idx = 1
     while idx <= retry_count
       yield
-      return if __find_and_modify__
+      return if __update_with_lock__
       reload
       idx += 1
     end
     raise RetryOverError, "retried #{retry_count} times but failed to update"
   end
 
-  def __find_and_modify__
+  def __update_with_lock__
     lock_field_name = self.class.locking_field
     current_version = self.send(lock_field_name)
     hash = as_document.dup
     new_version = current_version + 1
     hash[lock_field_name] = new_version
-    result = self.class.collection.find_and_modify({
-        :query => {:_id => self.id, lock_field_name.to_sym => current_version},
-        :update => hash
-      })
+
+    selector = { :_id => self.id, lock_field_name.to_sym => current_version }
+    result = update_in_safe_mode(self.class.collection, selector, hash)
+
     send("#{lock_field_name}=", new_version)
-    result
+    result["updatedExisting"] && !result["err"]
   end
 
   # ActiveRecord::Locking::Optimistic::ClassMethods を参考に実装しています

data/lib/tengine/core/safe_updatable.rb

@@ -0,0 +1,35 @@
+require 'tengine/core'
+
+module Tengine::Core::SafeUpdatable
+  extend ActiveSupport::Concern
+
+  module InstanceMethods
+    def update_in_safe_mode(collection, selector, document, opts=nil)
+      options = { :upsert => false, :multiple => false }
+      options.update(opts) if opts
+
+      options = options.merge({ :safe => safemode(collection) })
+
+      max_retries = 100
+      retries = 0
+      begin
+        # Return a Hash containing the last error object if running safe mode.
+        # Otherwise, returns true
+        result = collection.driver.update(selector, document, options)
+      rescue Mongo::ConnectionFailure => ex
+        retries += 1
+        raise ex if retries > max_retries
+        sleep 0.5
+        retry
+      end
+    end
+
+    def safemode(collection)
+      res = true
+      case collection.driver.db.connection when Mongo::ReplSetConnection then
+        res = { :w => "majority", :wtimeout => 1024, }
+      end
+      res
+    end
+  end
+end

data/lib/tengine/core/scheduler.rb

@@ -15,8 +15,10 @@ require_relative 'config/atd'
 require_relative 'method_traceable'
 require_relative 'schedule'
 require_relative 'mongoid_fix'
+require_relative 'safe_updatable'
 
 class Tengine::Core::Scheduler
+  include Tengine::Core::SafeUpdatable
 
   def initialize argv
     @uuid = UUID.new.generate
@@ -62,7 +64,9 @@ class Tengine::Core::Scheduler
     # 複数のマシンで複数のatdが複数動いている可能性があり、その場合には複数の
     # atdが同時に同じエントリに更新をかける可能性はとても高い。そのような状況
     # でもエラーになってはいけない。
-    Tengine::Core::Schedule.where(
+    Tengine::Core::Schedule.safely(
+      safemode(Tengine::Core::Schedule.collection)
+    ).where(
       :_id => sched.id,
       :status => Tengine::Core::Schedule::SCHEDULED
     ).update_all(

data/lib/tengine/core.rb

@@ -37,6 +37,7 @@ module Tengine::Core
   autoload :EventExceptionReportable, 'tengine/core/event_exception_reportable'
   autoload :FindByName          , 'tengine/core/find_by_name'
   autoload :Mutex               , 'tengine/core/mutex'
+  autoload :SafeUpdatable       , 'tengine/core/safe_updatable'
 
   class << self
     # Tengine::Coreの正常時の動きをアプリケーション運用者が確認できる内容を出力するロガー

data/spec/tengine/core/dsls/uc52_never_commit_event_unless_all_handler_submit_spec.rb

@@ -26,6 +26,7 @@ describe "uc52_commit_event_after_all_handler_submit" do
     STDOUT.should_receive(:puts).with("handler52_alt1_3 unacknowledged")
     mock_headers = mock(:headers)
     mock_headers.should_not_receive(:ack)
+    mock_headers.should_receive(:reject).with(:requeue => true)
     raw_event = Tengine::Event.new(:event_type_name => "event52_alt1")
     @kernel.before_delegate = lambda do
       @kernel.all_submitted?.should == false

data/tengine_core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "tengine_core"
-  s.version = "0.5.28"
+  s.version = "0.5.30"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["taigou", "totty", "g-morita", "shyouhei", "akm", "hiroshinakao"]
-  s.date = "2012-02-09"
+  s.date = "2012-02-14"
   s.description = "tengine_core is a framework/engine to support distributed processing"
   s.email = "tengine@nautilus-technologies.com"
   s.executables = ["tengined", "tengine_heartbeat_watchd", "tengine_atd"]
@@ -89,6 +89,7 @@ Gem::Specification.new do |s|
     "lib/tengine/core/mutex.rb",
     "lib/tengine/core/optimistic_lock.rb",
     "lib/tengine/core/plugins.rb",
+    "lib/tengine/core/safe_updatable.rb",
     "lib/tengine/core/schedule.rb",
     "lib/tengine/core/scheduler.rb",
     "lib/tengine/core/selectable_attr.rb",
@@ -176,7 +177,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/tengine/tengine_core"
   s.licenses = ["MPL2.0/LGPLv3"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.12"
+  s.rubygems_version = "1.8.10"
   s.summary = "tengine_core is a framework/engine to support distributed processing"
 
   if s.respond_to? :specification_version then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tengine_core
 version: !ruby/object:Gem::Version
-  version: 0.5.28
+  version: 0.5.30
   prerelease: 
 platform: ruby
 authors:
@@ -14,11 +14,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-09 00:00:00.000000000Z
+date: 2012-02-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2158399540 !ruby/object:Gem::Requirement
+  requirement: &70145822864700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -26,10 +26,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2158399540
+  version_requirements: *70145822864700
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &2158398560 !ruby/object:Gem::Requirement
+  requirement: &70145822864160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -37,10 +37,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2158398560
+  version_requirements: *70145822864160
 - !ruby/object:Gem::Dependency
   name: selectable_attr
-  requirement: &2158397540 !ruby/object:Gem::Requirement
+  requirement: &70145822863660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -48,10 +48,10 @@ dependencies:
         version: 0.3.15
   type: :runtime
   prerelease: false
-  version_requirements: *2158397540
+  version_requirements: *70145822863660
 - !ruby/object:Gem::Dependency
   name: bson
-  requirement: &2158396540 !ruby/object:Gem::Requirement
+  requirement: &70145822863140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -59,10 +59,10 @@ dependencies:
         version: 1.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *2158396540
+  version_requirements: *70145822863140
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &2158395700 !ruby/object:Gem::Requirement
+  requirement: &70145822862640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -70,10 +70,10 @@ dependencies:
         version: 1.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *2158395700
+  version_requirements: *70145822862640
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &2158394480 !ruby/object:Gem::Requirement
+  requirement: &70145822862080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -81,10 +81,10 @@ dependencies:
         version: 1.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *2158394480
+  version_requirements: *70145822862080
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &2158393020 !ruby/object:Gem::Requirement
+  requirement: &70145822861580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -92,10 +92,10 @@ dependencies:
         version: 2.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *2158393020
+  version_requirements: *70145822861580
 - !ruby/object:Gem::Dependency
   name: tengine_support
-  requirement: &2158392160 !ruby/object:Gem::Requirement
+  requirement: &70145822861080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -103,10 +103,10 @@ dependencies:
         version: 0.3.12
   type: :runtime
   prerelease: false
-  version_requirements: *2158392160
+  version_requirements: *70145822861080
 - !ruby/object:Gem::Dependency
   name: tengine_event
-  requirement: &2158379420 !ruby/object:Gem::Requirement
+  requirement: &70145822860580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -114,10 +114,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *2158379420
+  version_requirements: *70145822860580
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &2158378560 !ruby/object:Gem::Requirement
+  requirement: &70145822860100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -125,10 +125,10 @@ dependencies:
         version: 1.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *2158378560
+  version_requirements: *70145822860100
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2158377300 !ruby/object:Gem::Requirement
+  requirement: &70145822859580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -136,10 +136,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2158377300
+  version_requirements: *70145822859580
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &2158376420 !ruby/object:Gem::Requirement
+  requirement: &70145822859080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -147,10 +147,10 @@ dependencies:
         version: 2.1.2
   type: :development
   prerelease: false
-  version_requirements: *2158376420
+  version_requirements: *70145822859080
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2158375600 !ruby/object:Gem::Requirement
+  requirement: &70145822858600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -158,10 +158,10 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *2158375600
+  version_requirements: *70145822858600
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2158374620 !ruby/object:Gem::Requirement
+  requirement: &70145822858080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -169,10 +169,10 @@ dependencies:
         version: 1.0.18
   type: :development
   prerelease: false
-  version_requirements: *2158374620
+  version_requirements: *70145822858080
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2158373640 !ruby/object:Gem::Requirement
+  requirement: &70145822857580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -180,10 +180,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2158373640
+  version_requirements: *70145822857580
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2158372360 !ruby/object:Gem::Requirement
+  requirement: &70145822857080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -191,10 +191,10 @@ dependencies:
         version: 0.5.3
   type: :development
   prerelease: false
-  version_requirements: *2158372360
+  version_requirements: *70145822857080
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &2158361860 !ruby/object:Gem::Requirement
+  requirement: &70145822856600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -202,10 +202,10 @@ dependencies:
         version: 4.6.2
   type: :development
   prerelease: false
-  version_requirements: *2158361860
+  version_requirements: *70145822856600
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &2158360600 !ruby/object:Gem::Requirement
+  requirement: &70145822856120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -213,10 +213,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158360600
+  version_requirements: *70145822856120
 - !ruby/object:Gem::Dependency
   name: kramdown
-  requirement: &2158359680 !ruby/object:Gem::Requirement
+  requirement: &70145822855640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -224,7 +224,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158359680
+  version_requirements: *70145822855640
 description: tengine_core is a framework/engine to support distributed processing
 email: tengine@nautilus-technologies.com
 executables:
@@ -307,6 +307,7 @@ files:
 - lib/tengine/core/mutex.rb
 - lib/tengine/core/optimistic_lock.rb
 - lib/tengine/core/plugins.rb
+- lib/tengine/core/safe_updatable.rb
 - lib/tengine/core/schedule.rb
 - lib/tengine/core/scheduler.rb
 - lib/tengine/core/selectable_attr.rb
@@ -403,9 +404,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3873339066918298053
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -414,8 +412,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.12
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: tengine_core is a framework/engine to support distributed processing
 test_files: []
+has_rdoc: