sidekiq-unique-jobs 6.0.3 → 6.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e13fe0c30a750cead8f45300cdbe03caa9764e8c84064e411b05fb5eebc34f47
-  data.tar.gz: 8511c7d945ffad30aade383c8b79090f2fdc05f8d0e69673f0fbefd9a8ac6409
+  metadata.gz: f480135b8130f95ced00fab090bb07edc61c9b934dcea18f7fa3460cd9ad08d6
+  data.tar.gz: b88008341a02d7c7160c9ecba794e9a2600a17ceef34ae1e403e81b435ef17cb
 SHA512:
-  metadata.gz: 152c64c9c6e200677efda852adf0db068c1f39031d9975da0d339710ed6d94d78e434960d95a9417df70c859103c8036f9c35f90c3f07973c04ef958c814a8dc
-  data.tar.gz: b9823df969b1432395c29f88ebeb88cc20cea8af6dee1f9364c60574565204c68e63e4fedf0d1a3409f74ab2688aaa9426ab8a2581cdd2ef8962ce0a10a37d45
+  metadata.gz: a7e120a84552f62bedefbdba9559552fbd546d18369daa4475f0fb2bd43986c45fe47e94d66c0800d78480f499ed653222bbc1c445c5ed6f4f079604f2172ca2
+  data.tar.gz: 86b90d16ec677f5a1c7807dbfb3ef3288579368420e109499c2b212ee656f54a62c47bab3dd6ad41ece738cbf0051591cea913ec2e34a501aa2209c8d2f689ed

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## v6.0.4
+
+- Prevent locks from stealing each other (#316)
+
+## v6.0.3
+
+- Fixes a few hickups (#315)
+
 ## v6.0.2
 
 - Fixes sidekiq web pagination of unique digests

data/lib/sidekiq_unique_jobs/locksmith.rb

@@ -32,7 +32,6 @@ module SidekiqUniqueJobs
         keys: [exists_key, grabbed_key, available_key, version_key, UNIQUE_SET, unique_digest],
         argv: [jid, expiration, API_VERSION, concurrency],
       )
-      expire
     end
 
     def expire
@@ -40,7 +39,7 @@ module SidekiqUniqueJobs
         :expire,
         redis_pool,
         keys: [exists_key, available_key, version_key],
-        argv: [expiration],
+        argv: [expiration, jid],
       )
     end
 
@@ -82,6 +81,7 @@ module SidekiqUniqueJobs
       create
 
       grab_token(timeout) do |token|
+        expire
         touch_grabbed_token(token)
         return_token_or_block_value(token, &block)
       end

data/lib/sidekiq_unique_jobs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SidekiqUniqueJobs
-  VERSION = '6.0.3'
+  VERSION = '6.0.4'
 end

data/redis/create.lua

@@ -12,11 +12,16 @@ local expiration    = tonumber(ARGV[2])
 local api_version   = ARGV[3]
 local concurrency   = tonumber(ARGV[4])
 
-local stored_token  = redis.call('GETSET', exists_key, job_id)
-if stored_token then
+-- redis.log(redis.LOG_DEBUG, "create.lua - investigate possibility of locking jid: " .. job_id)
+
+local stored_token  = redis.call('GET', exists_key)
+if stored_token and stored_token ~= job_id then
+  -- redis.log(redis.LOG_DEBUG, "create.lua - jid: " .. job_id .. " - returning existing jid: " .. stored_token)
   return stored_token
 end
 
+redis.call('SET', exists_key, job_id)
+
 ----------------------------------------------------------------
 -- TODO: Legacy support (Remove in v6.1)
 local old_token  = redis.call('GET', unique_digest)
@@ -30,6 +35,7 @@ if old_token then
 end
 ----------------------------------------------------------------
 
+-- redis.log(redis.LOG_DEBUG, "create.lua - creating locks for jid: " .. job_id)
 redis.call('SADD', unique_keys, unique_digest)
 redis.call('EXPIRE', exists_key, 5)
 redis.call('DEL', grabbed_key)
@@ -42,7 +48,11 @@ if concurrency and concurrency > 1 then
 else
   redis.call('RPUSH', available_key, job_id)
 end
-redis.call('GETSET', version_key, api_version)
+
+-- redis.log(redis.LOG_DEBUG, "create.lua - persisting locks for jid: " .. job_id)
 redis.call('PERSIST', exists_key)
 
+redis.call('GETSET', version_key, api_version)
+
+
 return job_id

data/redis/expire.lua

@@ -5,9 +5,10 @@ local available_key = KEYS[2]
 local version_key   = KEYS[3]
 
 local expiration    = tonumber(ARGV[1])
+local job_id        = ARGV[2]
 
 if expiration then
-  redis.log(redis.LOG_DEBUG, "create.lua - expiring locks because expiration: " .. tostring(expiration))
+  -- redis.log(redis.LOG_DEBUG, "expire.lua - expiring locks for job_id: " .. job_id)
   redis.call('EXPIRE', available_key, expiration)
   redis.call('EXPIRE', exists_key, expiration)
   redis.call('EXPIRE', version_key, expiration)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-unique-jobs
 version: !ruby/object:Gem::Version
-  version: 6.0.3
+  version: 6.0.4
 platform: ruby
 authors:
 - Mikael Henriksson