redlock 0.1.3 → 0.1.4

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MWU3MmRhNjM0OWFkYTMyOTMzNzBiNDFjYjFmZDkwOGRhNGFkMzgzMQ==
-  data.tar.gz: !binary |-
-    M2EyYWE0YTk5NTg3MThiZWIzNjA2OGRhMjE3MzY1ZjBmMmU2OTI2Zg==
+SHA1:
+  metadata.gz: edd7557c70328ce28bfb2449afcbfbea7a0b12a2
+  data.tar.gz: eca5ea4f4e71cf7013d43541fbfb43af4edfb1d6
 SHA512:
-  metadata.gz: !binary |-
-    MDI3YjUyYjQxOTJmNzAyZTE5MGY3MjlhNWYyMjVmZDE4YWQ1YTRkMDA0ODcw
-    M2RlYmQ0NTA3NGUwZjdlYWM0MjM1MjFiNjY4N2YwMzkwM2I5M2MxZjM5OWVi
-    YzdlYzVmOTBlOTRkNzRhNjNhYjNhYzU0OGU1ZTJhNzg0NjUxMjQ=
-  data.tar.gz: !binary |-
-    MDFmYTU0MjRhZWFhOGY2NTM5YmM4NmQ2ZTA2MDI5NzQ1NjVlZjc2ODhhM2Nm
-    N2JkNmJlZTI5ODU3NzM3MmIxZjUxY2M5ZmZhOTNiOThiNzdmOGI1Zjc2ZTI3
-    ZDkxZGExNTBkY2Y3MGMyMmU0M2U4MmM4OWE5MWZhNTM5Mjg5ODQ=
+  metadata.gz: 1a97dfd84d0edf67f270332364593f52f8b679f88f4491f3291be115bf7571383f096a45c9fd04a81b46708057ca4c1f59ae50bd3dcc0e0842bdffa7b18e0238
+  data.tar.gz: f45f4b8436fc3d9141c8ed209627818fb1eaa082e95fbde6bdb9358463898b42103d0260920fa081edf743428caa050bfdbe4f81f02f026b68e7008db9b9b899

data/.travis.yml

@@ -4,3 +4,5 @@ services:
 rvm:
   - "2.0.0"
 script: bundle exec rspec spec
+sudo: false
+cache: bundler

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    redlock (0.1.2)
+    redlock (0.1.4)
       redis (~> 3, >= 3.0.5)
 
 GEM

data/README.md

@@ -86,7 +86,7 @@ begin
   block_result = lock_manager.lock!("resource_key", 2000) do
     # critical code
   end
-rescue Redlock::LockException
+rescue Redlock::LockError
   # error handling
 end
 ```

data/lib/redlock/client.rb

@@ -102,11 +102,15 @@ module Redlock
       end
 
       def lock(resource, val, ttl)
-        @redis.evalsha(@lock_script_sha, keys: [resource], argv: [val, ttl])
+        recover_from_script_flush do
+          @redis.evalsha @lock_script_sha, keys: [resource], argv: [val, ttl]
+        end
       end
 
       def unlock(resource, val)
-        @redis.evalsha(@unlock_script_sha, keys: [resource], argv: [val])
+        recover_from_script_flush do
+          @redis.evalsha @unlock_script_sha, keys: [resource], argv: [val]
+        end
       rescue
         # Nothing to do, unlocking is just a best-effort attempt.
       end
@@ -117,6 +121,24 @@ module Redlock
         @unlock_script_sha = @redis.script(:load, UNLOCK_SCRIPT)
         @lock_script_sha = @redis.script(:load, LOCK_SCRIPT)
       end
+
+      def recover_from_script_flush
+        retry_on_noscript = true
+        begin
+          yield
+        rescue Redis::CommandError => e
+          # When somebody has flushed the Redis instance's script cache, we might
+          # want to reload our scripts. Only attempt this once, though, to avoid
+          # going into an infinite loop.
+          if retry_on_noscript && e.message.include?('NOSCRIPT')
+            load_scripts
+            retry_on_noscript = false
+            retry
+          else
+            raise
+          end
+        end
+      end
     end
 
     def try_lock_instances(resource, ttl, extend)

data/lib/redlock/version.rb

@@ -1,3 +1,3 @@
 module Redlock
-  VERSION = "0.1.3"
+  VERSION = '0.1.4'
 end

data/spec/client_spec.rb

@@ -73,6 +73,43 @@ RSpec.describe Redlock::Client do
       end
     end
 
+    context 'when script cache has been flushed' do
+      before(:each) do
+        @manipulated_instance = lock_manager.instance_variable_get(:@servers).first
+        @manipulated_instance.instance_variable_get(:@redis).script(:flush)
+      end
+
+      it 'does not raise a Redis::CommandError: NOSCRIPT error' do
+        expect {
+          lock_manager.lock(resource_key, ttl)
+        }.to_not raise_error
+      end
+
+      it 'tries to load the scripts to cache again' do
+        expect(@manipulated_instance).to receive(:load_scripts).and_call_original
+        lock_manager.lock(resource_key, ttl)
+      end
+
+      context 'when the script re-loading fails' do
+        it 'does not try to to load the scripts to cache again twice' do
+          # This time we do not pass it through to Redis, in order to simulate a passing
+          # call to LOAD SCRIPT followed by another NOSCRIPT error. Imagine someone
+          # repeatedly calling SCRIPT FLUSH on our Redis instance.
+          expect(@manipulated_instance).to receive(:load_scripts)
+
+          expect {
+            lock_manager.lock(resource_key, ttl)
+          }.to raise_error(/NOSCRIPT/)
+        end
+      end
+
+      context 'when the script re-loading succeeds' do
+        it 'locks' do
+          expect(lock_manager.lock(resource_key, ttl)).to be_lock_info_for(resource_key)
+        end
+      end
+    end
+
     describe 'block syntax' do
       context 'when lock is available' do
         it 'locks' do

metadata

@@ -1,89 +1,89 @@
 --- !ruby/object:Gem::Specification
 name: redlock
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Leandro Moreira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-09 00:00:00.000000000 Z
+date: 2015-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.5
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
 description: Distributed lock using Redis written in Ruby. Highly inspired by https://github.com/antirez/redlock-rb.
@@ -93,9 +93,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CONTRIBUTORS
 - Gemfile
 - Gemfile.lock
@@ -120,17 +120,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Distributed lock using Redis written in Ruby.
@@ -138,3 +138,4 @@ test_files:
 - spec/client_spec.rb
 - spec/spec_helper.rb
 - spec/testing_spec.rb
+has_rdoc: