sidekiq-unique-jobs 6.0.25 → 7.1.33

Sign up to get free protection for your applications and to get access to all the features.
Files changed (130) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +1157 -41
  3. data/README.md +825 -291
  4. data/lib/sidekiq_unique_jobs/batch_delete.rb +124 -0
  5. data/lib/sidekiq_unique_jobs/changelog.rb +78 -0
  6. data/lib/sidekiq_unique_jobs/cli.rb +57 -29
  7. data/lib/sidekiq_unique_jobs/config.rb +319 -0
  8. data/lib/sidekiq_unique_jobs/connection.rb +6 -5
  9. data/lib/sidekiq_unique_jobs/constants.rb +46 -25
  10. data/lib/sidekiq_unique_jobs/core_ext.rb +80 -0
  11. data/lib/sidekiq_unique_jobs/deprecation.rb +65 -0
  12. data/lib/sidekiq_unique_jobs/digests.rb +70 -102
  13. data/lib/sidekiq_unique_jobs/exceptions.rb +88 -12
  14. data/lib/sidekiq_unique_jobs/expiring_digests.rb +14 -0
  15. data/lib/sidekiq_unique_jobs/job.rb +46 -12
  16. data/lib/sidekiq_unique_jobs/json.rb +47 -0
  17. data/lib/sidekiq_unique_jobs/key.rb +98 -0
  18. data/lib/sidekiq_unique_jobs/lock/base_lock.rb +111 -82
  19. data/lib/sidekiq_unique_jobs/lock/client_validator.rb +28 -0
  20. data/lib/sidekiq_unique_jobs/lock/server_validator.rb +27 -0
  21. data/lib/sidekiq_unique_jobs/lock/until_and_while_executing.rb +40 -15
  22. data/lib/sidekiq_unique_jobs/lock/until_executed.rb +30 -7
  23. data/lib/sidekiq_unique_jobs/lock/until_executing.rb +26 -2
  24. data/lib/sidekiq_unique_jobs/lock/until_expired.rb +27 -15
  25. data/lib/sidekiq_unique_jobs/lock/validator.rb +96 -0
  26. data/lib/sidekiq_unique_jobs/lock/while_executing.rb +26 -12
  27. data/lib/sidekiq_unique_jobs/lock/while_executing_reject.rb +3 -3
  28. data/lib/sidekiq_unique_jobs/lock.rb +342 -0
  29. data/lib/sidekiq_unique_jobs/lock_args.rb +127 -0
  30. data/lib/sidekiq_unique_jobs/lock_config.rb +126 -0
  31. data/lib/sidekiq_unique_jobs/lock_digest.rb +79 -0
  32. data/lib/sidekiq_unique_jobs/lock_info.rb +68 -0
  33. data/lib/sidekiq_unique_jobs/lock_timeout.rb +62 -0
  34. data/lib/sidekiq_unique_jobs/lock_ttl.rb +77 -0
  35. data/lib/sidekiq_unique_jobs/lock_type.rb +37 -0
  36. data/lib/sidekiq_unique_jobs/locksmith.rb +305 -101
  37. data/lib/sidekiq_unique_jobs/logging/middleware_context.rb +44 -0
  38. data/lib/sidekiq_unique_jobs/logging.rb +202 -33
  39. data/lib/sidekiq_unique_jobs/lua/delete.lua +51 -0
  40. data/lib/sidekiq_unique_jobs/lua/delete_by_digest.lua +42 -0
  41. data/lib/sidekiq_unique_jobs/lua/delete_job_by_digest.lua +38 -0
  42. data/lib/sidekiq_unique_jobs/lua/find_digest_in_queues.lua +26 -0
  43. data/lib/sidekiq_unique_jobs/lua/lock.lua +99 -0
  44. data/lib/sidekiq_unique_jobs/lua/lock_until_expired.lua +92 -0
  45. data/lib/sidekiq_unique_jobs/lua/locked.lua +35 -0
  46. data/lib/sidekiq_unique_jobs/lua/queue.lua +87 -0
  47. data/lib/sidekiq_unique_jobs/lua/reap_orphans.lua +122 -0
  48. data/lib/sidekiq_unique_jobs/lua/shared/_common.lua +40 -0
  49. data/lib/sidekiq_unique_jobs/lua/shared/_current_time.lua +8 -0
  50. data/lib/sidekiq_unique_jobs/lua/shared/_delete_from_queue.lua +22 -0
  51. data/lib/sidekiq_unique_jobs/lua/shared/_delete_from_sorted_set.lua +18 -0
  52. data/lib/sidekiq_unique_jobs/lua/shared/_find_digest_in_process_set.lua +53 -0
  53. data/lib/sidekiq_unique_jobs/lua/shared/_find_digest_in_queues.lua +43 -0
  54. data/lib/sidekiq_unique_jobs/lua/shared/_find_digest_in_sorted_set.lua +24 -0
  55. data/lib/sidekiq_unique_jobs/lua/shared/_hgetall.lua +13 -0
  56. data/lib/sidekiq_unique_jobs/lua/shared/_upgrades.lua +3 -0
  57. data/lib/sidekiq_unique_jobs/lua/unlock.lua +107 -0
  58. data/lib/sidekiq_unique_jobs/lua/update_version.lua +40 -0
  59. data/lib/sidekiq_unique_jobs/lua/upgrade.lua +68 -0
  60. data/lib/sidekiq_unique_jobs/middleware/client.rb +42 -0
  61. data/lib/sidekiq_unique_jobs/middleware/server.rb +31 -0
  62. data/lib/sidekiq_unique_jobs/middleware.rb +29 -43
  63. data/lib/sidekiq_unique_jobs/normalizer.rb +4 -4
  64. data/lib/sidekiq_unique_jobs/on_conflict/log.rb +9 -5
  65. data/lib/sidekiq_unique_jobs/on_conflict/null_strategy.rb +1 -1
  66. data/lib/sidekiq_unique_jobs/on_conflict/raise.rb +1 -1
  67. data/lib/sidekiq_unique_jobs/on_conflict/reject.rb +63 -17
  68. data/lib/sidekiq_unique_jobs/on_conflict/replace.rb +54 -14
  69. data/lib/sidekiq_unique_jobs/on_conflict/reschedule.rb +16 -5
  70. data/lib/sidekiq_unique_jobs/on_conflict/strategy.rb +25 -6
  71. data/lib/sidekiq_unique_jobs/on_conflict.rb +23 -10
  72. data/lib/sidekiq_unique_jobs/options_with_fallback.rb +39 -36
  73. data/lib/sidekiq_unique_jobs/orphans/lua_reaper.rb +29 -0
  74. data/lib/sidekiq_unique_jobs/orphans/manager.rb +241 -0
  75. data/lib/sidekiq_unique_jobs/orphans/null_reaper.rb +24 -0
  76. data/lib/sidekiq_unique_jobs/orphans/observer.rb +42 -0
  77. data/lib/sidekiq_unique_jobs/orphans/reaper.rb +114 -0
  78. data/lib/sidekiq_unique_jobs/orphans/reaper_resurrector.rb +170 -0
  79. data/lib/sidekiq_unique_jobs/orphans/ruby_reaper.rb +298 -0
  80. data/lib/sidekiq_unique_jobs/redis/entity.rb +112 -0
  81. data/lib/sidekiq_unique_jobs/redis/hash.rb +56 -0
  82. data/lib/sidekiq_unique_jobs/redis/list.rb +32 -0
  83. data/lib/sidekiq_unique_jobs/redis/set.rb +32 -0
  84. data/lib/sidekiq_unique_jobs/redis/sorted_set.rb +86 -0
  85. data/lib/sidekiq_unique_jobs/redis/string.rb +51 -0
  86. data/lib/sidekiq_unique_jobs/redis.rb +11 -0
  87. data/lib/sidekiq_unique_jobs/reflectable.rb +26 -0
  88. data/lib/sidekiq_unique_jobs/reflections.rb +79 -0
  89. data/lib/sidekiq_unique_jobs/rspec/matchers/have_valid_sidekiq_options.rb +51 -0
  90. data/lib/sidekiq_unique_jobs/rspec/matchers.rb +26 -0
  91. data/lib/sidekiq_unique_jobs/script/caller.rb +127 -0
  92. data/lib/sidekiq_unique_jobs/script.rb +15 -0
  93. data/lib/sidekiq_unique_jobs/server.rb +61 -0
  94. data/lib/sidekiq_unique_jobs/sidekiq_unique_ext.rb +114 -65
  95. data/lib/sidekiq_unique_jobs/sidekiq_unique_jobs.rb +252 -36
  96. data/lib/sidekiq_unique_jobs/sidekiq_worker_methods.rb +47 -32
  97. data/lib/sidekiq_unique_jobs/testing.rb +102 -29
  98. data/lib/sidekiq_unique_jobs/timer_task.rb +299 -0
  99. data/lib/sidekiq_unique_jobs/timing.rb +58 -0
  100. data/lib/sidekiq_unique_jobs/unlockable.rb +20 -4
  101. data/lib/sidekiq_unique_jobs/update_version.rb +25 -0
  102. data/lib/sidekiq_unique_jobs/upgrade_locks.rb +155 -0
  103. data/lib/sidekiq_unique_jobs/version.rb +3 -1
  104. data/lib/sidekiq_unique_jobs/version_check.rb +23 -4
  105. data/lib/sidekiq_unique_jobs/web/helpers.rb +138 -13
  106. data/lib/sidekiq_unique_jobs/web/views/_paging.erb +4 -4
  107. data/lib/sidekiq_unique_jobs/web/views/changelogs.erb +54 -0
  108. data/lib/sidekiq_unique_jobs/web/views/lock.erb +110 -0
  109. data/lib/sidekiq_unique_jobs/web/views/locks.erb +54 -0
  110. data/lib/sidekiq_unique_jobs/web.rb +82 -32
  111. data/lib/sidekiq_unique_jobs.rb +54 -7
  112. data/lib/tasks/changelog.rake +16 -16
  113. metadata +134 -177
  114. data/lib/sidekiq_unique_jobs/client/middleware.rb +0 -56
  115. data/lib/sidekiq_unique_jobs/scripts.rb +0 -118
  116. data/lib/sidekiq_unique_jobs/server/middleware.rb +0 -46
  117. data/lib/sidekiq_unique_jobs/timeout/calculator.rb +0 -63
  118. data/lib/sidekiq_unique_jobs/timeout.rb +0 -8
  119. data/lib/sidekiq_unique_jobs/unique_args.rb +0 -150
  120. data/lib/sidekiq_unique_jobs/util.rb +0 -103
  121. data/lib/sidekiq_unique_jobs/web/views/unique_digest.erb +0 -28
  122. data/lib/sidekiq_unique_jobs/web/views/unique_digests.erb +0 -46
  123. data/redis/acquire_lock.lua +0 -21
  124. data/redis/convert_legacy_lock.lua +0 -13
  125. data/redis/delete.lua +0 -14
  126. data/redis/delete_by_digest.lua +0 -23
  127. data/redis/delete_job_by_digest.lua +0 -60
  128. data/redis/lock.lua +0 -62
  129. data/redis/release_stale_locks.lua +0 -90
  130. data/redis/unlock.lua +0 -35
@@ -3,64 +3,109 @@
3
3
  module SidekiqUniqueJobs
4
4
  # Lock manager class that handles all the various locks
5
5
  #
6
- # @author Mikael Henriksson <mikael@zoolutions.se>
7
- # rubocop:disable Metrics/ClassLength
8
- class Locksmith
6
+ # @author Mikael Henriksson <mikael@mhenrixon.com>
7
+ class Locksmith # rubocop:disable Metrics/ClassLength
8
+ # includes "SidekiqUniqueJobs::Connection"
9
+ # @!parse include SidekiqUniqueJobs::Connection
9
10
  include SidekiqUniqueJobs::Connection
10
11
 
12
+ # includes "SidekiqUniqueJobs::Logging"
13
+ # @!parse include SidekiqUniqueJobs::Logging
14
+ include SidekiqUniqueJobs::Logging
15
+
16
+ # includes "SidekiqUniqueJobs::Reflectable"
17
+ # @!parse include SidekiqUniqueJobs::Reflectable
18
+ include SidekiqUniqueJobs::Reflectable
19
+
20
+ # includes "SidekiqUniqueJobs::Timing"
21
+ # @!parse include SidekiqUniqueJobs::Timing
22
+ include SidekiqUniqueJobs::Timing
23
+
24
+ # includes "SidekiqUniqueJobs::Script::Caller"
25
+ # @!parse include SidekiqUniqueJobs::Script::Caller
26
+ include SidekiqUniqueJobs::Script::Caller
27
+
28
+ # includes "SidekiqUniqueJobs::JSON"
29
+ # @!parse include SidekiqUniqueJobs::JSON
30
+ include SidekiqUniqueJobs::JSON
31
+
32
+ #
33
+ # @return [Float] used to take into consideration the inaccuracy of redis timestamps
34
+ CLOCK_DRIFT_FACTOR = 0.01
35
+ NETWORK_FACTOR = 0.04
36
+
37
+ #
38
+ # @!attribute [r] key
39
+ # @return [Key] the key used for locking
40
+ attr_reader :key
41
+ #
42
+ # @!attribute [r] job_id
43
+ # @return [String] a sidekiq JID
44
+ attr_reader :job_id
45
+ #
46
+ # @!attribute [r] config
47
+ # @return [LockConfig] the configuration for this lock
48
+ attr_reader :config
49
+ #
50
+ # @!attribute [r] item
51
+ # @return [Hash] a sidekiq job hash
52
+ attr_reader :item
53
+
54
+ #
55
+ # Initialize a new Locksmith instance
56
+ #
11
57
  # @param [Hash] item a Sidekiq job hash
12
- # @option item [Integer] :lock_expiration the configured expiration
58
+ # @option item [Integer] :lock_ttl the configured expiration
13
59
  # @option item [String] :jid the sidekiq job id
14
- # @option item [String] :unique_digest the unique digest (See: {UniqueArgs#unique_digest})
60
+ # @option item [String] :unique_digest the unique digest (See: {LockDigest#lock_digest})
15
61
  # @param [Sidekiq::RedisConnection, ConnectionPool] redis_pool the redis connection
62
+ #
16
63
  def initialize(item, redis_pool = nil)
17
- # @concurrency = 1 # removed in a0cff5bc42edbe7190d6ede7e7f845074d2d7af6
18
- @ttl = item[LOCK_EXPIRATION_KEY] || item[LOCK_TTL_KEY]
19
- @jid = item[JID_KEY]
20
- @unique_digest = item[UNIQUE_DIGEST_KEY] || item[LOCK_DIGEST_KEY]
21
- @lock_type = item[LOCK_KEY] || item[UNIQUE_KEY]
22
- @lock_type &&= @lock_type.to_sym
23
- @redis_pool = redis_pool
64
+ @item = item
65
+ @key = Key.new(item[LOCK_DIGEST] || item[UNIQUE_DIGEST]) # fallback until can be removed
66
+ @job_id = item[JID]
67
+ @config = LockConfig.new(item)
68
+ @redis_pool = redis_pool
24
69
  end
25
70
 
26
71
  #
27
- # Deletes the lock unless it has a ttl set
72
+ # Deletes the lock unless it has a pttl set
28
73
  #
29
74
  #
30
75
  def delete
31
- return if ttl
76
+ return if config.pttl.positive?
32
77
 
33
78
  delete!
34
79
  end
35
80
 
36
- # Deletes the lock regardless of if it has a ttl set
81
+ #
82
+ # Deletes the lock regardless of if it has a pttl set
83
+ #
37
84
  def delete!
38
- Scripts.call(
39
- :delete,
40
- redis_pool,
41
- keys: [exists_key, grabbed_key, available_key, version_key, UNIQUE_SET, unique_digest],
42
- )
85
+ call_script(:delete, key.to_a, [job_id, config.pttl, config.type, config.limit]).to_i.positive?
43
86
  end
44
87
 
45
88
  #
46
- # Create a lock for the item
47
- #
48
- # @param [Integer] timeout the number of seconds to wait for a lock.
89
+ # Create a lock for the Sidekiq job
49
90
  #
50
- # @return [String] the Sidekiq job_id (jid)
91
+ # @return [String] the Sidekiq job_id that was locked/queued
51
92
  #
52
- #
53
- def lock(timeout = nil, &block)
54
- Scripts.call(:lock, redis_pool,
55
- keys: [exists_key, grabbed_key, available_key, UNIQUE_SET, unique_digest],
56
- argv: [jid, ttl, lock_type])
93
+ def lock(wait: nil)
94
+ method_name = wait ? :primed_async : :primed_sync
95
+ redis(redis_pool) do |conn|
96
+ lock!(conn, method(method_name), wait) do
97
+ return job_id
98
+ end
99
+ end
100
+ end
57
101
 
58
- grab_token(timeout) do |token|
59
- touch_grabbed_token(token)
60
- return_token_or_block_value(token, &block)
102
+ def execute(&block)
103
+ raise SidekiqUniqueJobs::InvalidArgument, "#execute needs a block" unless block
104
+
105
+ redis(redis_pool) do |conn|
106
+ lock!(conn, method(:primed_async), &block)
61
107
  end
62
108
  end
63
- alias wait lock
64
109
 
65
110
  #
66
111
  # Removes the lock keys from Redis if locked by the provided jid/token
@@ -68,122 +113,281 @@ module SidekiqUniqueJobs
68
113
  # @return [false] unless locked?
69
114
  # @return [String] Sidekiq job_id (jid) if successful
70
115
  #
71
- def unlock(token = nil)
72
- token ||= jid
73
- return false unless locked?(token)
116
+ def unlock(conn = nil)
117
+ return false unless locked?(conn)
74
118
 
75
- unlock!(token)
119
+ unlock!(conn)
76
120
  end
77
121
 
78
122
  #
79
123
  # Removes the lock keys from Redis
80
124
  #
81
- # @param [String] token the token to unlock (defaults to jid)
82
- #
83
125
  # @return [false] unless locked?
84
126
  # @return [String] Sidekiq job_id (jid) if successful
85
127
  #
86
- def unlock!(token = nil)
87
- token ||= jid
128
+ def unlock!(conn = nil)
129
+ call_script(:unlock, key.to_a, argv, conn) do |unlocked_jid|
130
+ if unlocked_jid == job_id
131
+ reflect(:debug, :unlocked, item, unlocked_jid)
132
+ reflect(:unlocked, item)
133
+ end
88
134
 
89
- Scripts.call(
90
- :unlock,
91
- redis_pool,
92
- keys: [exists_key, grabbed_key, available_key, version_key, UNIQUE_SET, unique_digest],
93
- argv: [token, ttl, lock_type],
94
- )
135
+ unlocked_jid
136
+ end
95
137
  end
96
138
 
139
+ # Checks if this instance is considered locked
97
140
  #
98
- # @param [String] token the unique token to check for a lock.
99
- # nil will default to the jid provided in the initializer
100
- # @return [true, false]
141
+ # @param [Sidekiq::RedisConnection, ConnectionPool] conn the redis connection
101
142
  #
102
- # Checks if this instance is considered locked
143
+ # @return [true, false] true when the :LOCKED hash contains the job_id
144
+ #
145
+ def locked?(conn = nil)
146
+ return taken?(conn) if conn
147
+
148
+ redis { |rcon| taken?(rcon) }
149
+ end
150
+
151
+ #
152
+ # Nicely formatted string with information about self
103
153
  #
104
- # @param [<type>] token <description>
105
154
  #
106
- # @return [<type>] <description>
155
+ # @return [String]
107
156
  #
108
- def locked?(token = nil)
109
- token ||= jid
157
+ def to_s
158
+ "Locksmith##{object_id}(digest=#{key} job_id=#{job_id} locked=#{locked?})"
159
+ end
160
+
161
+ #
162
+ # @see to_s
163
+ #
164
+ def inspect
165
+ to_s
166
+ end
110
167
 
111
- convert_legacy_lock(token)
112
- redis(redis_pool) { |conn| conn.hexists(grabbed_key, token) }
168
+ #
169
+ # Compare this locksmith with another
170
+ #
171
+ # @param [Locksmith] other the locksmith to compare with
172
+ #
173
+ # @return [true, false]
174
+ #
175
+ def ==(other)
176
+ key == other.key && job_id == other.job_id
113
177
  end
114
178
 
115
179
  private
116
180
 
117
- attr_reader :unique_digest, :ttl, :jid, :redis_pool, :lock_type
181
+ attr_reader :redis_pool
118
182
 
119
- def convert_legacy_lock(token)
120
- Scripts.call(
121
- :convert_legacy_lock,
122
- redis_pool,
123
- keys: [grabbed_key, unique_digest],
124
- argv: [token, current_time.to_f],
125
- )
126
- end
183
+ #
184
+ # Used to reduce some duplication from the two methods
185
+ #
186
+ # @see lock
187
+ # @see execute
188
+ #
189
+ # @param [Sidekiq::RedisConnection, ConnectionPool] conn the redis connection
190
+ # @param [Method] primed_method reference to the method to use for getting a primed token
191
+ # @param [nil, Integer, Float] time to wait before timeout
192
+ #
193
+ # @yieldparam [string] job_id the sidekiq JID
194
+ # @yieldreturn [void] whatever the calling block returns
195
+ def lock!(conn, primed_method, wait = nil)
196
+ return yield if locked?(conn)
127
197
 
128
- def grab_token(timeout = nil)
129
- redis(redis_pool) do |conn|
130
- if timeout.nil? || timeout.positive?
131
- # passing timeout 0 to blpop causes it to block
132
- _key, token = conn.blpop(available_key, timeout || 0)
133
- else
134
- token = conn.lpop(available_key)
198
+ enqueue(conn) do |queued_jid|
199
+ reflect(:debug, :queued, item, queued_jid)
200
+
201
+ primed_method.call(conn, wait) do |primed_jid|
202
+ reflect(:debug, :primed, item, primed_jid)
203
+ locked_jid = call_script(:lock, key.to_a, argv, conn)
204
+
205
+ if locked_jid
206
+ reflect(:debug, :locked, item, locked_jid)
207
+ return yield
208
+ end
135
209
  end
210
+ end
211
+ end
136
212
 
137
- return yield jid if token
213
+ #
214
+ # Prepares all the various lock data
215
+ #
216
+ # @param [Redis] conn a redis connection
217
+ #
218
+ # @return [nil] when redis was already prepared for this lock
219
+ # @return [yield<String>] when successfully enqueued
220
+ #
221
+ def enqueue(conn)
222
+ queued_jid, elapsed = timed do
223
+ call_script(:queue, key.to_a, argv, conn)
138
224
  end
225
+
226
+ return unless queued_jid
227
+ return unless [job_id, "1"].include?(queued_jid)
228
+
229
+ validity = config.pttl - elapsed - drift(config.pttl)
230
+ return unless validity >= 0 || config.pttl.zero?
231
+
232
+ write_lock_info(conn)
233
+ yield job_id
139
234
  end
140
235
 
141
- def touch_grabbed_token(token)
142
- redis(redis_pool) do |conn|
143
- conn.hset(grabbed_key, token, current_time.to_f)
144
- conn.expire(grabbed_key, ttl) if ttl && lock_type == :until_expired
236
+ #
237
+ # Pops an enqueued token
238
+ # @note Used for runtime locks to avoid problems with blocking commands
239
+ # in current thread
240
+ #
241
+ # @param [Redis] conn a redis connection
242
+ #
243
+ # @return [nil] when lock was not possible
244
+ # @return [Object] whatever the block returns when lock was acquired
245
+ #
246
+ def primed_async(conn, wait = nil, &block)
247
+ timeout = (wait || config.timeout).to_i
248
+ timeout = 1 if timeout.zero?
249
+
250
+ brpoplpush_timeout = timeout
251
+ concurrent_timeout = add_drift(timeout)
252
+
253
+ reflect(:debug, :timeouts, item,
254
+ timeouts: {
255
+ brpoplpush_timeout: brpoplpush_timeout,
256
+ concurrent_timeout: concurrent_timeout,
257
+ })
258
+
259
+ # NOTE: When debugging, change .value to .value!
260
+ primed_jid = Concurrent::Promises
261
+ .future(conn) { |red_con| pop_queued(red_con, timeout) }
262
+ .value
263
+
264
+ handle_primed(primed_jid, &block)
265
+ end
266
+
267
+ #
268
+ # Pops an enqueued token
269
+ # @note Used for non-runtime locks
270
+ #
271
+ # @param [Redis] conn a redis connection
272
+ #
273
+ # @return [nil] when lock was not possible
274
+ # @return [Object] whatever the block returns when lock was acquired
275
+ #
276
+ def primed_sync(conn, wait = nil, &block)
277
+ primed_jid = pop_queued(conn, wait)
278
+ handle_primed(primed_jid, &block)
279
+ end
280
+
281
+ def handle_primed(primed_jid)
282
+ return yield job_id if [job_id, "1"].include?(primed_jid)
283
+
284
+ reflect(:timeout, item) unless config.wait_for_lock?
285
+ end
286
+
287
+ #
288
+ # Does the actual popping of the enqueued token
289
+ #
290
+ # @param [Redis] conn a redis connection
291
+ #
292
+ # @return [String] a previously enqueued token (now taken off the queue)
293
+ #
294
+ def pop_queued(conn, wait = 1)
295
+ wait ||= config.timeout if config.wait_for_lock?
296
+
297
+ if wait.nil?
298
+ rpoplpush(conn)
299
+ else
300
+ brpoplpush(conn, wait)
145
301
  end
146
302
  end
147
303
 
148
- def return_token_or_block_value(token)
149
- return token unless block_given?
304
+ #
305
+ # @api private
306
+ #
307
+ def brpoplpush(conn, wait)
308
+ # passing timeout 0 to brpoplpush causes it to block indefinitely
309
+ raise InvalidArgument, "wait must be an integer" unless wait.is_a?(Integer)
310
+
311
+ if defined?(::Redis::Namespace) && conn.instance_of?(::Redis::Namespace)
312
+ return conn.brpoplpush(key.queued, key.primed, wait)
313
+ end
150
314
 
151
- # The reason for begin is to only signal when we have a block
152
- begin
153
- yield token
154
- ensure
155
- unlock(token)
315
+ if VersionCheck.satisfied?(redis_version, ">= 6.2.0") && conn.respond_to?(:blmove)
316
+ conn.blmove(key.queued, key.primed, "RIGHT", "LEFT", timeout: wait)
317
+ else
318
+ conn.brpoplpush(key.queued, key.primed, timeout: wait)
156
319
  end
157
320
  end
158
321
 
159
- def available_key
160
- @available_key ||= namespaced_key("AVAILABLE")
322
+ #
323
+ # @api private
324
+ #
325
+ def rpoplpush(conn)
326
+ conn.rpoplpush(key.queued, key.primed)
327
+ end
328
+
329
+ #
330
+ # Writes lock information to redis.
331
+ # The lock information contains information about worker, queue, limit etc.
332
+ #
333
+ #
334
+ # @return [void]
335
+ #
336
+ def write_lock_info(conn)
337
+ return unless config.lock_info?
338
+
339
+ conn.set(key.info, lock_info)
161
340
  end
162
341
 
163
- def exists_key
164
- @exists_key ||= namespaced_key("EXISTS")
342
+ #
343
+ # Used to combat redis imprecision with ttl/pttl
344
+ #
345
+ # @param [Integer] val the value to compute drift for
346
+ #
347
+ # @return [Integer] a computed drift value
348
+ #
349
+ def drift(val)
350
+ # Add 2 milliseconds to the drift to account for Redis expires
351
+ # precision, which is 1 millisecond, plus 1 millisecond min drift
352
+ # for small TTLs.
353
+ (val + 2).to_f * CLOCK_DRIFT_FACTOR
165
354
  end
166
355
 
167
- def grabbed_key
168
- @grabbed_key ||= namespaced_key("GRABBED")
356
+ def add_drift(val)
357
+ val = val.to_f
358
+ val + drift(val)
169
359
  end
170
360
 
171
- def version_key
172
- @version_key ||= namespaced_key("VERSION")
361
+ #
362
+ # Checks if the lock has been taken
363
+ #
364
+ # @param [Redis] conn a redis connection
365
+ #
366
+ # @return [true, false]
367
+ #
368
+ def taken?(conn)
369
+ conn.hexists(key.locked, job_id)
173
370
  end
174
371
 
175
- def namespaced_key(variable)
176
- "#{unique_digest}:#{variable}"
372
+ def argv
373
+ [job_id, config.pttl, config.type, config.limit]
177
374
  end
178
375
 
179
- def current_time
180
- seconds, microseconds_with_frac = redis_time
181
- Time.at(seconds, microseconds_with_frac)
376
+ def lock_info
377
+ @lock_info ||= dump_json(
378
+ WORKER => item[CLASS],
379
+ QUEUE => item[QUEUE],
380
+ LIMIT => item[LOCK_LIMIT],
381
+ TIMEOUT => item[LOCK_TIMEOUT],
382
+ TTL => item[LOCK_TTL],
383
+ TYPE => config.type,
384
+ LOCK_ARGS => item[LOCK_ARGS],
385
+ TIME => now_f,
386
+ )
182
387
  end
183
388
 
184
- def redis_time
185
- redis(&:time)
389
+ def redis_version
390
+ @redis_version ||= SidekiqUniqueJobs.config.redis_version
186
391
  end
187
392
  end
188
- # rubocop:enable Metrics/ClassLength
189
393
  end
@@ -0,0 +1,44 @@
1
+ # frozen_string_literal: true
2
+
3
+ module SidekiqUniqueJobs
4
+ #
5
+ # Provides the sidekiq middleware that makes the gem work
6
+ #
7
+ # @author Mikael Henriksson <mikael@mhenrixon.com>
8
+ #
9
+ module Logging
10
+ #
11
+ # Context aware logging for Sidekiq Middlewares
12
+ #
13
+ # @author Mikael Henriksson <mikael@mhenrixon.com>
14
+ #
15
+ module Middleware
16
+ include Logging
17
+
18
+ def self.included(base)
19
+ base.class_eval do
20
+ extend Logging::Middleware
21
+ end
22
+ end
23
+
24
+ #
25
+ # Provides a logging context for Sidekiq Middlewares
26
+ #
27
+ #
28
+ # @return [Hash] when logger responds to `:with_context`
29
+ # @return [String] when logger does not responds to `:with_context`
30
+ #
31
+ def logging_context
32
+ middleware = is_a?(SidekiqUniqueJobs::Middleware::Client) ? :client : :server
33
+ digest = item[LOCK_DIGEST]
34
+ lock_type = item[LOCK]
35
+
36
+ if logger_context_hash?
37
+ { "uniquejobs" => middleware, lock_type => digest }
38
+ else
39
+ "uniquejobs-#{middleware} #{"DIG-#{digest}" if digest}"
40
+ end
41
+ end
42
+ end
43
+ end
44
+ end