deadlock_retry 1.1.1 → 1.1.2

data/CHANGELOG

@@ -1,5 +1,10 @@
 deadlock_retry changes
 
+== v1.1.2
+
+* Exponential backoff, sleep 0, 1, 2, 4... seconds between retries.
+* Support new syntax for InnoDB status in MySQL 5.5.
+
 == v1.1.1 (2011-05-13)
 
 * Conditionally log INNODB STATUS only if user has permission. (osheroff)

data/deadlock_retry.gemspec

@@ -1,12 +1,15 @@
 # -*- encoding: utf-8 -*-
 
+require './lib/deadlock_retry'
+
 Gem::Specification.new do |s|
   s.name = %q{deadlock_retry}
-  s.version = "1.1.1"
+  s.version = DeadlockRetry::VERSION
   s.authors = ["Jamis Buck", "Mike Perham"]
   s.description = s.summary = %q{Provides automatic deadlock retry and logging functionality for ActiveRecord and MySQL}
   s.email = %q{mperham@gmail.com}
   s.files = `git ls-files`.split("\n")
   s.homepage = %q{http://github.com/mperham/deadlock_retry}
   s.require_paths = ["lib"]
+  s.add_development_dependency 'mocha'
 end

data/lib/deadlock_retry.rb

@@ -1,4 +1,9 @@
+require 'active_support/core_ext/module/attribute_accessors'
+
 module DeadlockRetry
+
+  VERSION = '1.1.2'
+
   def self.included(base)
     base.extend(ClassMethods)
     base.class_eval do
@@ -8,15 +13,7 @@ module DeadlockRetry
     end
   end
 
-  @@innodb_status_available = nil
-
-  def self.innodb_status_available?
-    @@innodb_status_available
-  end
-
-  def self.innodb_status_available=(bool)
-    @@innodb_status_available = bool
-  end
+  mattr_accessor :innodb_status_cmd
 
   module ClassMethods
     DEADLOCK_ERROR_MESSAGES = [
@@ -40,7 +37,8 @@ module DeadlockRetry
           raise if retry_count >= MAXIMUM_RETRIES_ON_DEADLOCK
           retry_count += 1
           logger.info "Deadlock detected on retry #{retry_count}, restarting transaction"
-          log_innodb_status if DeadlockRetry.innodb_status_available?
+          log_innodb_status if DeadlockRetry.innodb_status_cmd
+          exponential_pause(retry_count)
           retry
         else
           raise
@@ -50,25 +48,41 @@ module DeadlockRetry
 
     private
 
+    WAIT_TIMES = [0, 1, 2, 4, 8, 16, 32]
+
+    def exponential_pause(count)
+      sec = WAIT_TIMES[count-1] || 32
+      # sleep 0, 1, 2, 4, ... seconds up to the MAXIMUM_RETRIES.
+      # Cap the pause time at 32 seconds.
+      sleep(sec) if sec != 0
+    end
+
     def in_nested_transaction?
       # open_transactions was added in 2.2's connection pooling changes.
       connection.open_transactions != 0
     end
 
     def show_innodb_status
-       self.connection.select_value("show innodb status")
+       self.connection.select_value(DeadlockRetry.innodb_status_cmd)
     end
 
     # Should we try to log innodb status -- if we don't have permission to,
     # we actually break in-flight transactions, silently (!)
     def check_innodb_status_available
-      return unless DeadlockRetry.innodb_status_available? == nil
+      return unless DeadlockRetry.innodb_status_cmd == nil
 
       begin
-        show_innodb_status
-        DeadlockRetry.innodb_status_available = true
+        mysql_version = self.connection.execute('show variables like \'version\'').to_a[0][1]
+        cmd = if mysql_version < '5.5'
+          'show innodb status'
+        else
+          'show engine innodb status'
+        end
+        self.connection.select_value(cmd)
+        DeadlockRetry.innodb_status_cmd = cmd
       rescue
-        DeadlockRetry.innodb_status_available = false
+        logger.info "Cannot log innodb status: #{$!.message}"
+        DeadlockRetry.innodb_status_cmd = false
       end
     end
 
@@ -80,12 +94,12 @@ module DeadlockRetry
       lines.each_line do |line|
         logger.warn line
       end
-    rescue Exception => e
+    rescue => e
       # Access denied, ignore
-      logger.warn "Cannot log innodb status: #{e.message}"
+      logger.info "Cannot log innodb status: #{e.message}"
     end
 
   end
 end
 
-ActiveRecord::Base.send(:include, DeadlockRetry)
+ActiveRecord::Base.send(:include, DeadlockRetry) if defined?(ActiveRecord)

data/test/deadlock_retry_test.rb

@@ -7,6 +7,7 @@ require 'active_record/version'
 puts "Testing ActiveRecord #{ActiveRecord::VERSION::STRING}"
 
 require 'test/unit'
+require 'mocha'
 require 'logger'
 require "deadlock_retry"
 
@@ -36,8 +37,12 @@ class MockModel
     []
   end
 
-  def self.reset_innodb_status_availability
-    DeadlockRetry.innodb_status_availability = nil
+  def self.execute(sql)
+    [['version', '5.1.45']]
+  end
+
+  def self.select_value(sql)
+    true
   end
 
   include DeadlockRetry
@@ -48,6 +53,7 @@ class DeadlockRetryTest < Test::Unit::TestCase
   TIMEOUT_ERROR = "MySQL::Error: Lock wait timeout exceeded"
 
   def setup
+    MockModel.stubs(:exponential_pause)
   end
 
   def test_no_errors
@@ -83,9 +89,9 @@ class DeadlockRetryTest < Test::Unit::TestCase
   end
 
   def test_innodb_status_availability
-    DeadlockRetry.innodb_status_available = nil
+    DeadlockRetry.innodb_status_cmd = nil
     MockModel.transaction {}
-    assert_equal true, DeadlockRetry.innodb_status_available?
+    assert_equal "show innodb status", DeadlockRetry.innodb_status_cmd
   end
 
 

metadata

@@ -1,28 +1,35 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: deadlock_retry
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.1.2
   prerelease: 
-  version: 1.1.1
 platform: ruby
-authors: 
+authors:
 - Jamis Buck
 - Mike Perham
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-14 00:00:00 Z
-dependencies: []
-
-description: Provides automatic deadlock retry and logging functionality for ActiveRecord and MySQL
+date: 2011-10-27 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &2152103420 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2152103420
+description: Provides automatic deadlock retry and logging functionality for ActiveRecord
+  and MySQL
 email: mperham@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - CHANGELOG
 - LICENSE
@@ -33,30 +40,27 @@ files:
 - test/deadlock_retry_test.rb
 homepage: http://github.com/mperham/deadlock_retry
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Provides automatic deadlock retry and logging functionality for ActiveRecord and MySQL
+summary: Provides automatic deadlock retry and logging functionality for ActiveRecord
+  and MySQL
 test_files: []
-