distribute_reads 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6f3a694f47520a9cf55b522c9a2acf4ec54be50
-  data.tar.gz: 20d1d2439e24112ac8d165ad79623edc65222f9d
+  metadata.gz: db257dfd9b8679aad4cc3d4ee162234ee7375fda
+  data.tar.gz: 87daf348a55b8b11e17aa6fcdb181f0233b59569
 SHA512:
-  metadata.gz: 5434b9aa41816fed52ed2cb9f4f18445b4d5242b9f8f78ad40830e00981ffa2cd46dad8fbe8e4e77f3b98716624075b4e0854bb99d19554fa07492c5f9c90b31
-  data.tar.gz: 7d4116b3c7a8c17a96cf6838fbf29f16a89454162a699786b73dba5e64475d757c749143f12b0275fef333329474db60e822343908e8fda4f34f51af8896d4d3
+  metadata.gz: 86bd0d6b2be128b6bc20b0b6ff0eb455b7eba40f33db2d12437326f13bc60c1400ed6d3f871c84a1dd9fe97ffc5122aa4b3a93291e9c1dde8d3e4dd3814a86cc
+  data.tar.gz: 937a288f831c21fa91546ad6ad89d4a84ea239edf6739a6936540a19cc3a0ec1d9fe19aeefea3e57ffce77d32c50bb536f9309b038c749d17fa9497976eae551

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.2.2
+
+- Added support for MySQL replication lag
+- Added `replica` option
+
 ## 0.2.1
 
 - Fixed lag check for Postgres 10

data/README.md

@@ -76,7 +76,7 @@ You can pass any options as well.
 
 ### Replica Lag
 
-Raise an error when replica lag is too high - *PostgreSQL only*
+Raise an error when replica lag is too high
 
 ```ruby
 distribute_reads(max_lag: 3) do

data/distribute_reads.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest"
-  spec.add_development_dependency "pg"
+  spec.add_development_dependency "pg", "< 1"
+  spec.add_development_dependency "mysql2"
   spec.add_development_dependency "activejob"
 end

data/lib/distribute_reads.rb

@@ -29,12 +29,13 @@ module DistributeReads
     raise DistributeReads::Error, "Don't use outside distribute_reads" unless Thread.current[:distribute_reads]
 
     connection ||= ActiveRecord::Base.connection
-    if %w(PostgreSQL PostGIS).include?(connection.adapter_name)
-      replica_pool = connection.instance_variable_get(:@slave_pool)
-      if replica_pool && replica_pool.connections.size > 1
-        warn "[distribute_reads] Multiple replicas available, lag only reported for one"
-      end
 
+    replica_pool = connection.instance_variable_get(:@slave_pool)
+    if replica_pool && replica_pool.connections.size > 1
+      warn "[distribute_reads] Multiple replicas available, lag only reported for one"
+    end
+
+    if %w(PostgreSQL PostGIS).include?(connection.adapter_name)
       # cache the version number
       @server_version_num ||= {}
       cache_key = connection.pool.object_id
@@ -53,6 +54,16 @@ module DistributeReads
           ELSE EXTRACT (EPOCH FROM NOW() - pg_last_xact_replay_timestamp())
         END AS lag".squish
       ).first["lag"].to_f
+    elsif %w(MySQL Mysql2 Mysql2Spatial Mysql2Rgeo).include?(connection.adapter_name)
+      replica_value = Thread.current[:distribute_reads][:replica]
+      begin
+        # makara doesn't send SHOW queries to replica, so we must force it
+        Thread.current[:distribute_reads][:replica] = true
+        status = connection.exec_query("SHOW SLAVE STATUS").to_hash.first
+        status ? status["Seconds_Behind_Master"].to_f : 0.0
+      ensure
+        Thread.current[:distribute_reads][:replica] = replica_value
+      end
     else
       raise DistributeReads::Error, "Option not supported with this adapter"
     end

data/lib/distribute_reads/appropriate_pool.rb

@@ -2,7 +2,14 @@ module DistributeReads
   module AppropriatePool
     def _appropriate_pool(*args)
       if Thread.current[:distribute_reads]
-        if Thread.current[:distribute_reads][:primary] || needs_master?(*args) || (blacklisted = @slave_pool.completely_blacklisted?)
+        if Thread.current[:distribute_reads][:replica]
+          if @slave_pool.completely_blacklisted?
+            raise DistributeReads::NoReplicasAvailable, "No replicas available" if Thread.current[:distribute_reads][:failover] == false
+            @master_pool
+          else
+            @slave_pool
+          end
+        elsif Thread.current[:distribute_reads][:primary] || needs_master?(*args) || (blacklisted = @slave_pool.completely_blacklisted?)
           raise DistributeReads::NoReplicasAvailable, "No replicas available" if blacklisted && Thread.current[:distribute_reads][:failover] == false
           stick_to_master(*args) if DistributeReads.by_default
           @master_pool

data/lib/distribute_reads/global_methods.rb

@@ -3,14 +3,18 @@ module DistributeReads
     def distribute_reads(**options)
       raise ArgumentError, "Missing block" unless block_given?
 
-      unknown_keywords = options.keys - [:failover, :lag_failover, :lag_on, :max_lag, :primary]
+      unknown_keywords = options.keys - [:failover, :lag_failover, :lag_on, :max_lag, :primary, :replica]
       raise ArgumentError, "Unknown keywords: #{unknown_keywords.join(", ")}" if unknown_keywords.any?
 
       options = DistributeReads.default_options.merge(options)
 
       previous_value = Thread.current[:distribute_reads]
       begin
-        Thread.current[:distribute_reads] = {failover: options[:failover], primary: options[:primary]}
+        Thread.current[:distribute_reads] = {
+          failover: options[:failover],
+          primary: options[:primary],
+          replica: options[:replica]
+        }
 
         # TODO ensure same connection is used to test lag and execute queries
         max_lag = options[:max_lag]
@@ -20,6 +24,8 @@ module DistributeReads
               if options[:lag_failover]
                 # TODO possibly per connection
                 Thread.current[:distribute_reads][:primary] = true
+                Thread.current[:distribute_reads][:replica] = false
+                break
               else
                 raise DistributeReads::TooMuchLag, "Replica lag over #{max_lag} seconds#{options[:lag_on] ? " on #{base_model.name} connection" : ""}"
               end

data/lib/distribute_reads/version.rb

@@ -1,3 +1,3 @@
 module DistributeReads
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: distribute_reads
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-15 00:00:00.000000000 Z
+date: 2018-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: makara
@@ -68,6 +68,20 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1'
+- !ruby/object:Gem::Dependency
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="