apisonator 2.100.0 → 2.100.1.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '02689c2d07caa6e88eb1079c13064378fafa921ffb28e4da095cd8ad5fbac578'
-  data.tar.gz: 434d69fc1eb06088b1c4111bd41979567f1b00c22b149e5b4a7bdbda48c447a1
+  metadata.gz: dae3de8eebce04d8b04a021fec76abb818d1cd822cbc694b68b4d871dfc9fd3a
+  data.tar.gz: c333324eac2bcb8b4cc8bc2a098a8d8ad6e646ddb1f013788b18a9662369f7c2
 SHA512:
-  metadata.gz: edc21e4dedc90447e734e7afe0fe681127d9a4a88cd4ba3d9f9633b7eae3ee31488aa54b9cfaaeb6e28c158eb822c9679e325c4b6773130779fd63f5a6498fe9
-  data.tar.gz: 3267cfad364babfafb0c563feea99ecd0ff346b7a12d224b37178ff28e13a92fcce8a25372b1901f54a1bfcf6ecdeea0f9665ac2e30dcc6fe0fa3aff15bce468
+  metadata.gz: c5ac555a4aa397ae529ce15788f045319fc816a22841eb04e8f07111291eee560b6ebd45641b93233c1e6e0044561e4bec10889678452e66123e8a977d29ffb1
+  data.tar.gz: 602aa508a6d4506bb15dfe200936b2455dc5acbaa3990c6f45fa0c7a9c4d59ab172758d44d6f91a679548e7a2127f61f6482b40dc0002e9d18a4da2ba8db2753

data/Gemfile.base

@@ -9,7 +9,7 @@ gemspec
 # implementations (ie. pure Ruby, java, etc).
 #
 platform :ruby do
-  gem 'hiredis', '= 0.6.1'
+  gem 'hiredis', '~> 0.6.1'
   gem 'yajl-ruby', '~> 1.3.1', require: 'yajl'
   gem 'pry-byebug', '~> 3.5.1', groups: [:development]
 end
@@ -52,7 +52,6 @@ gem 'daemons', '= 1.2.4'
 # Production gems
 gem 'rake', '~> 13.0'
 gem 'builder', '= 3.2.3'
-gem 'redis', '= 4.1.1'
 # Use a patched resque to allow reusing their Airbrake Failure class
 gem 'resque', git: 'https://github.com/3scale/resque', branch: '3scale'
 gem 'rack', '~> 2.0.8'
@@ -63,3 +62,8 @@ gem 'bugsnag', '~> 6', require: nil
 gem 'yabeda-prometheus', '~> 0.5.0'
 gem 'async-redis', '~> 0.4.1'
 gem 'falcon', '~> 0.35'
+
+# Use a patched redis-rb that fixes an issue when trying to connect with
+# sentinels and avoids retrying calls when there's a timeout to prevent
+# duplicated commands. It's based on version 4.1.3.
+gem 'redis', git: 'https://github.com/3scale/redis-rb', branch: 'apisonator'

data/Gemfile.lock

@@ -5,6 +5,13 @@ GIT
   specs:
     puma (2.15.3)
 
+GIT
+  remote: https://github.com/3scale/redis-rb
+  revision: 35301b3d952975300a4cb30d408ae3b5969d0440
+  branch: apisonator
+  specs:
+    redis (4.1.3)
+
 GIT
   remote: https://github.com/3scale/resque
   revision: 88839e71756ea9b6edfc9426a0af71e94109c135
@@ -28,7 +35,7 @@ GIT
 PATH
   remote: .
   specs:
-    apisonator (2.100.0)
+    apisonator (2.100.1.pre1)
 
 GEM
   remote: https://rubygems.org/
@@ -116,7 +123,7 @@ GEM
       reentrant_flock
       sinatra (>= 1.2.7)
     gli (2.16.1)
-    hiredis (0.6.1)
+    hiredis (0.6.3)
     httpclient (2.8.3)
     i18n (0.9.1)
       concurrent-ruby (~> 1.0)
@@ -182,7 +189,6 @@ GEM
     rack-test (0.8.2)
       rack (>= 1.0, < 3)
     rake (13.0.1)
-    redis (4.1.1)
     redis-namespace (1.6.0)
       redis (>= 3.0.4)
     reentrant_flock (0.1.1)
@@ -284,7 +290,7 @@ DEPENDENCIES
   falcon (~> 0.35)
   geminabox (~> 0.13.11)
   gli (~> 2.16.1)
-  hiredis (= 0.6.1)
+  hiredis (~> 0.6.1)
   license_finder (~> 5)
   mocha (~> 1.3)
   nokogiri (~> 1.10.8)
@@ -297,7 +303,7 @@ DEPENDENCIES
   rack (~> 2.0.8)
   rack-test (~> 0.8.2)
   rake (~> 13.0)
-  redis (= 4.1.1)
+  redis!
   resque!
   resque_spec (~> 0.17.0)
   resque_unit (~> 0.4.4)!

data/Gemfile.on_prem.lock

@@ -5,6 +5,13 @@ GIT
   specs:
     puma (2.15.3)
 
+GIT
+  remote: https://github.com/3scale/redis-rb
+  revision: 35301b3d952975300a4cb30d408ae3b5969d0440
+  branch: apisonator
+  specs:
+    redis (4.1.3)
+
 GIT
   remote: https://github.com/3scale/resque
   revision: 88839e71756ea9b6edfc9426a0af71e94109c135
@@ -106,7 +113,7 @@ GEM
       reentrant_flock
       sinatra (>= 1.2.7)
     gli (2.16.1)
-    hiredis (0.6.1)
+    hiredis (0.6.3)
     httpclient (2.8.3)
     i18n (0.9.1)
       concurrent-ruby (~> 1.0)
@@ -170,7 +177,6 @@ GEM
     rack-test (0.8.2)
       rack (>= 1.0, < 3)
     rake (13.0.1)
-    redis (4.1.1)
     redis-namespace (1.6.0)
       redis (>= 3.0.4)
     reentrant_flock (0.1.1)
@@ -266,7 +272,7 @@ DEPENDENCIES
   falcon (~> 0.35)
   geminabox (~> 0.13.11)
   gli (~> 2.16.1)
-  hiredis (= 0.6.1)
+  hiredis (~> 0.6.1)
   license_finder (~> 5)
   mocha (~> 1.3)
   nokogiri (~> 1.10.8)
@@ -278,7 +284,7 @@ DEPENDENCIES
   rack (~> 2.0.8)
   rack-test (~> 0.8.2)
   rake (~> 13.0)
-  redis (= 4.1.1)
+  redis!
   resque!
   resque_spec (~> 0.17.0)
   resque_unit (~> 0.4.4)!

data/lib/3scale/backend.rb

@@ -5,7 +5,6 @@ require 'builder'
 require 'hiredis'
 
 require 'redis'
-require '3scale/backend/extensions/redis'
 
 require 'resque'
 require 'securerandom'

data/lib/3scale/backend/storage_helpers.rb

@@ -44,9 +44,13 @@ module ThreeScale
               connect_timeout: 5,
               read_timeout: 3,
               write_timeout: 3,
-              # this is set to zero to avoid potential double transactions
-              # see https://github.com/redis/redis-rb/issues/668
-              reconnect_attempts: 0,
+              # Note that we can set reconnect_attempts to >= 0 because we use
+              # our redis-rb fork which implements a workaround for this issue
+              # that shows that when there might be duplicated transactions when
+              # there's a timeout: https://github.com/redis/redis-rb/issues/668
+              # We should investigate if there are edge cases that can lead to
+              # duplicated commands because of this setting.
+              reconnect_attempts: 1,
               # use by default the C extension client
               driver: :hiredis
           }.freeze

data/lib/3scale/backend/version.rb

@@ -1,5 +1,5 @@
 module ThreeScale
   module Backend
-    VERSION = '2.100.0'
+    VERSION = '2.100.1.pre1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apisonator
 version: !ruby/object:Gem::Version
-  version: 2.100.0
+  version: 2.100.1.pre1
 platform: ruby
 authors:
 - Adam Ciganek
@@ -88,7 +88,6 @@ files:
 - lib/3scale/backend/extensions/array.rb
 - lib/3scale/backend/extensions/hash.rb
 - lib/3scale/backend/extensions/nil_class.rb
-- lib/3scale/backend/extensions/redis.rb
 - lib/3scale/backend/extensions/string.rb
 - lib/3scale/backend/extensions/time.rb
 - lib/3scale/backend/failed_jobs_scheduler.rb

data/lib/3scale/backend/extensions/redis.rb

@@ -1,44 +0,0 @@
-# Monkey-patches a method in Redis::Client::Connector::Sentinel to fix a bug
-# with sentinel passwords. It applies the fix in
-# https://github.com/redis/redis-rb/pull/856.
-#
-# The fix was included in 4.1.2, but we cannot upgrade because that version
-# drops support for ruby < 2.3.0 which we still need to support.
-#
-# This should only be temporary. It should be deleted when updating the gem.
-class Redis
-  class Client
-    class Connector
-      class Sentinel
-        def sentinel_detect
-          @sentinels.each do |sentinel|
-            client = Redis::Client.new(@options.merge({:host => sentinel[:host],
-                                                       :port => sentinel[:port],
-                                                       password: sentinel[:password],
-                                                       :reconnect_attempts => 0,
-                                                      }))
-
-            begin
-              if result = yield(client)
-                # This sentinel responded. Make sure we ask it first next time.
-                @sentinels.delete(sentinel)
-                @sentinels.unshift(sentinel)
-
-                return result
-              end
-            rescue BaseConnectionError
-            rescue RuntimeError => exception
-              # Needed because when the sentinel address cannot be resolved it
-              # raises this instead of "BaseConnectionError"
-              raise unless exception.message =~ /Name or service not known/
-            ensure
-              client.disconnect
-            end
-          end
-
-          raise CannotConnectError, "No sentinels available."
-        end
-      end
-    end
-  end
-end