master_slave_adapter_soundcloud 0.1.3 → 0.1.6

data/.gitignore

@@ -1,3 +1,5 @@
 tags
 test/*
 pkg/*
+.rvmrc
+Gemfile.lock

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.6

data/lib/master_slave_adapter.rb

@@ -47,8 +47,9 @@ module ActiveRecord
       def massage(config)
         config = config.symbolize_keys
         skip = [ :adapter, :connection_adapter, :master, :slaves ]
-        defaults = config.reject { |k,_| skip.include?(k) }
-                         .merge(:adapter => config.fetch(:connection_adapter))
+        defaults = config.
+          reject { |k,_| skip.include?(k) }.
+          merge(:adapter => config.fetch(:connection_adapter))
         ([config.fetch(:master)] + config.fetch(:slaves, [])).map do |cfg|
           cfg.symbolize_keys!.reverse_merge!(defaults)
         end
@@ -142,7 +143,7 @@ module ActiveRecord
         # try random slave, else fall back to master
         slave = slave_connection!
         conn =
-          if !open_transaction? && slave_clock(slave).try(:>=, clock)
+          if !open_transaction? && slave_consistent?(slave, clock)
             [ slave, :slave ]
           else
             [ master_connection, :master ]
@@ -264,8 +265,8 @@ module ActiveRecord
                :delete_sql,
                :sanitize_limit,
                :to => :master_connection
-      delegate *ActiveRecord::ConnectionAdapters::SchemaStatements.instance_methods,
-               :to => :master_connection
+      delegate *(ActiveRecord::ConnectionAdapters::SchemaStatements.instance_methods + [{
+               :to => :master_connection }])
       # no clear interface contract:
       delegate :tables,         # commented in SchemaStatements
                :truncate_table, # monkeypatching database_cleaner gem
@@ -298,8 +299,10 @@ module ActiveRecord
       private :connection_for_read
 
       # === doesn't really matter, but must be handled by underlying adapter
-      delegate *ActiveRecord::ConnectionAdapters::Quoting.instance_methods,
-               :to => :current_connection
+      delegate *(ActiveRecord::ConnectionAdapters::Quoting.instance_methods + [{
+               :to => :current_connection }])
+      # issue #4: current_database is not supported by all adapters, though
+      delegate :current_database, :to => :current_connection
 
       # UTIL ==================================================================
 
@@ -340,13 +343,18 @@ module ActiveRecord
         end
       end
 
-      def slave_clock(connection = nil)
-        conn ||= slave_connection!
+      def slave_clock(conn)
         if status = conn.uncached { conn.select_one("SHOW SLAVE STATUS") }
-          Clock.new(status['Relay_Master_Log_File'], status['Exec_Master_Log_Pos'])
+          Clock.new(status['Relay_Master_Log_File'], status['Exec_Master_Log_Pos']).tap do |c|
+            set_last_seen_slave_clock(conn, c)
+          end
         end
       end
 
+      def slave_consistent?(conn, clock)
+        (get_last_seen_slave_clock(conn) || slave_clock(conn)).try(:>=, clock)
+      end
+
     protected
 
       def on_write
@@ -406,6 +414,17 @@ module ActiveRecord
       def on_rollback_callbacks
         Thread.current[:on_rollback_callbacks] ||= []
       end
+
+      def get_last_seen_slave_clock(conn)
+        conn.instance_variable_get(:@last_seen_slave_clock)
+      end
+
+      def set_last_seen_slave_clock(conn, clock)
+        last_seen = get_last_seen_slave_clock(conn)
+        if last_seen.nil? || last_seen < clock
+          conn.instance_variable_set(:@last_seen_slave_clock, clock)
+        end
+      end
     end
   end
 end

data/master_slave_adapter.gemspec

@@ -4,7 +4,7 @@ $:.push File.expand_path("../lib", __FILE__)
 Gem::Specification.new do |s|
   s.name        = 'master_slave_adapter_soundcloud'
   s.version     = File.read('VERSION').to_s
-  s.date        = '2011-06-21'
+  s.date        = '2011-08-23'
   s.platform    = Gem::Platform::RUBY
   s.authors     = [ 'Mauricio Linhares', 'Torsten Curdt', 'Kim Altintop', 'Omid Aladini', 'SoundCloud' ]
   s.email       = %q{kim@soundcloud.com tcurdt@soundcloud.com omid@soundcloud.com}

data/specs/specs.rb

@@ -211,17 +211,17 @@ describe ActiveRecord::ConnectionAdapters::MasterSlaveAdapter do
     def slave_should_report_clock(pos)
       pos = Array(pos)
       values = pos.map { |p| { 'Relay_Master_Log_File' => '', 'Exec_Master_Log_Pos' => p } }
-      slave_connection
-        .should_receive('select_one').exactly(pos.length).with('SHOW SLAVE STATUS')
-        .and_return(*values)
+      slave_connection.
+        should_receive('select_one').exactly(pos.length).with('SHOW SLAVE STATUS').
+        and_return(*values)
     end
 
     def master_should_report_clock(pos)
       pos = Array(pos)
       values = pos.map { |p| { 'File' => '', 'Position' => p } }
-      master_connection
-        .should_receive('select_one').exactly(pos.length).with('SHOW MASTER STATUS')
-        .and_return(*values)
+      master_connection.
+        should_receive('select_one').exactly(pos.length).with('SHOW MASTER STATUS').
+        and_return(*values)
     end
 
     SelectMethods.each do |method|
@@ -287,26 +287,27 @@ describe ActiveRecord::ConnectionAdapters::MasterSlaveAdapter do
       slave_should_report_clock(0)
       master_should_report_clock([0, 1, 1])
 
-      slave_connection
-        .should_receive('select_all').exactly(1).times.with('testing')
-        .and_return(true)
+      slave_connection.
+        should_receive('select_all').exactly(1).times.with('testing').
+        and_return(true)
 
-      master_connection
-        .should_receive('update').exactly(3).times.with('testing')
-        .and_return(true)
-     master_connection
-        .should_receive('select_all').exactly(5).times.with('testing')
-        .and_return(true)
+      master_connection.
+        should_receive('update').exactly(3).times.with('testing').
+        and_return(true)
+     master_connection.
+        should_receive('select_all').exactly(5).times.with('testing').
+        and_return(true)
       %w(begin_db_transaction
          commit_db_transaction
          increment_open_transactions
-         decrement_open_transactions).each do |txstmt|
+         decrement_open_transactions
+         outside_transaction?).each do |txstmt|
         master_connection.should_receive(txstmt).exactly(1).times
       end
 
-      master_connection
-        .should_receive('open_transactions').exactly(13).times
-        .and_return(
+      master_connection.
+        should_receive('open_transactions').exactly(13).times.
+        and_return(
           # adapter: with_consistency, select_all, update, select_all
           0, 0, 0, 0,
           # connection: transaction
@@ -341,10 +342,10 @@ describe ActiveRecord::ConnectionAdapters::MasterSlaveAdapter do
 
     context "with nested with_consistency" do
       it "should return the same clock if not writing and no lag" do
-        slave_should_report_clock([ 0, 0 ])
-        slave_connection
-          .should_receive('select_one').exactly(3).times.with('testing')
-          .and_return(true)
+        slave_should_report_clock(0) # note: tests memoizing slave clock
+        slave_connection.
+          should_receive('select_one').exactly(3).times.with('testing').
+          and_return(true)
 
         old_clock = zero
         new_clock = ActiveRecord::Base.with_consistency(old_clock) do
@@ -358,13 +359,15 @@ describe ActiveRecord::ConnectionAdapters::MasterSlaveAdapter do
       end
 
       it "requesting a newer clock should return a new clock" do
-        slave_should_report_clock([0,0])
-        slave_connection
-          .should_receive('select_all').exactly(2).times.with('testing')
-          .and_return(true)
-        master_connection
-          .should_receive('select_all').exactly(1).times.with('testing')
-          .and_return(true)
+        adapter_connection.
+          should_receive('slave_consistent?').exactly(2).times.
+          and_return(true, false)
+        slave_connection.
+          should_receive('select_all').exactly(2).times.with('testing').
+          and_return(true)
+        master_connection.
+          should_receive('select_all').exactly(1).times.with('testing').
+          and_return(true)
 
         start_clock = zero
         inner_clock = zero
@@ -439,23 +442,24 @@ describe ActiveRecord::ConnectionAdapters::MasterSlaveAdapter do
     end
 
     def run_tx
-      adapter_connection
-        .should_receive('master_clock')
-        .and_return(Clock.new('', 1))
+      adapter_connection.
+        should_receive('master_clock').
+        and_return(Clock.new('', 1))
       %w(begin_db_transaction
          commit_db_transaction
          increment_open_transactions
-         decrement_open_transactions).each do |txstmt|
-        master_connection
-          .should_receive(txstmt).exactly(1).times
+         decrement_open_transactions
+         outside_transaction?).each do |txstmt|
+        master_connection.
+          should_receive(txstmt).exactly(1).times
       end
-      master_connection
-        .should_receive('open_transactions').exactly(4).times
-        .and_return(0, 1, 0, 0)
+      master_connection.
+        should_receive('open_transactions').exactly(4).times.
+        and_return(0, 1, 0, 0)
 
-      master_connection
-        .should_receive('update').with('testing')
-        .and_return(true)
+      master_connection.
+        should_receive('update').with('testing').
+        and_return(true)
 
       ActiveRecord::Base.transaction do
         adapter_connection.send('update', 'testing')
@@ -467,15 +471,17 @@ describe ActiveRecord::ConnectionAdapters::MasterSlaveAdapter do
          rollback_db_transaction
          increment_open_transactions
          decrement_open_transactions).each do |txstmt|
-        master_connection
-          .should_receive(txstmt).exactly(1).times
-      end
-      master_connection
-        .should_receive('open_transactions').exactly(3).times
-        .and_return(0, 1, 0)
-      master_connection
-        .should_receive('update').with('testing')
-        .and_return(true)
+        master_connection.
+          should_receive(txstmt).exactly(1).times
+      end
+      master_connection.
+        should_receive('outside_transaction?').exactly(2).times
+      master_connection.
+        should_receive('open_transactions').exactly(3).times.
+        and_return(0, 1, 0)
+      master_connection.
+        should_receive('update').with('testing').
+        and_return(true)
 
       ActiveRecord::Base.transaction do
         adapter_connection.send('update', 'testing')

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: master_slave_adapter_soundcloud
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 3
-  version: 0.1.3
+  prerelease: 
+  version: 0.1.6
 platform: ruby
 authors: 
 - Mauricio Linhares
@@ -18,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-21 00:00:00 +02:00
+date: 2011-08-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,8 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id001
@@ -42,10 +36,6 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 3
-        - 9
         version: 2.3.9
   type: :runtime
   version_requirements: *id002
@@ -82,25 +72,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 9
-      - 2
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 7
       version: 1.3.7
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Replication Aware Master/Slave Database Adapter for Rails/ActiveRecord