redis_queued_locks 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4846c7a27c9ce2108903a9b9b9250a38aa18ae34be6da85b4055bfe9c20371bb
-  data.tar.gz: 0346d8a0c4d43490ea0fcf79c7048e70c480285b18f26f84b06ad24fe42dc9fc
+  metadata.gz: 463b0613174c7a3806aef19ce962bbe5ed91d342796bec84ea47b2aa79cf61fb
+  data.tar.gz: 4d483db40896d77049e3e6d324a206606225c9c8e8b592072b1f501563fb7ec8
 SHA512:
-  metadata.gz: cbf5bd49d6c3b912ff8e3b8061cae4e2b1eaea00f913c8f217058168e7008f3c4daaeef0888ca22bce22d318742db1890c8524293e20734b4dea506fc3eeae10
-  data.tar.gz: 744519a43e3f1eb98527cbcb5495700b16a6ea94de95732baf8027debc14df7e5fa0394f804a9360383eb9168d3975794b46c4a0a6c45d1b769fd0c94e1700b5
+  metadata.gz: f829f8afc264f8a44d0edd1469c5ada76c7257f15ef6945c3f154fe2908b29d5ace4ce0c11365a30af1cdbb6d3b4aeec30227b84500da65b720f22247ed96053
+  data.tar.gz: 1eee0e4c2a665b57ee6d2c2c2d6488c065bbcdd586cfe06f2890a6b412a3a009675dd26e39383f2fad54434288d4c3c7660fba2faaa3013da98ab27c484b08b0

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 ## [Unreleased]
 
+## [0.0.9] - 2024-02-27
+### Changed
+- The lock acquier identifier (`acq_id`) now includes the fiber id, the ractor id and an unique per-process
+  10 byte string. It is added in order to prevent collisions between different processes/pods
+  that will have the same procjet id / thread id identifiers (cuz it is an object_id integers) that can lead
+  to the same position with the same `acq_id` for different processes/pods in the lock request queue.
+
 ## [0.0.8] - 2024-02-27
 ### Added
 - `RedisQueuedLock::Client#locked?`

data/README.md

@@ -60,7 +60,7 @@ require 'redis_queued_locks'
 require 'redis_queued_locks'
 
 # Step 1: initialize RedisClient instance
-redis_clinet = RedisClient.config.new_pool # NOTE: provide your ounw RedisClient instance
+redis_clinet = RedisClient.config.new_pool # NOTE: provide your own RedisClient instance
 
 # Step 2: initialize RedisQueuedLock::Client instance
 rq_lock_client = RedisQueuedLocks::Client.new(redis_client) do |config|
@@ -119,6 +119,13 @@ clinet = RedisQueuedLocks::Client.new(redis_client) do |config|
   #   - payload: <hash> requried;
   # - disabled by default via VoidNotifier;
   config.instrumenter = RedisQueuedLocks::Instrument::ActiveSupport
+
+  # (default: -> { RedisQueuedLocks::Resource.calc_uniq_identity })
+  # - uniqude idenfitier that is uniq per process/pod;
+  # - prevents potential lock-acquirement collisions bettween different process/pods
+  #   that have identical process_id/thread_id/fiber_id/ractor_id (identivcal acquier ids);
+  # - it is calculated once per `RedisQueudLocks::Client` instance;
+  config.uniq_identifier = -> { RedisQueuedLocks::Resource.calc_uniq_identity }
 end
 ```
 
@@ -142,8 +149,6 @@ end
 ```ruby
 def lock(
   lock_name,
-  process_id: RedisQueuedLocks::Resource.get_process_id,
-  thread_id: RedisQueuedLocks::Resource.get_thread_id,
   ttl: config[:default_lock_ttl],
   queue_ttl: config[:default_queue_ttl],
   timeout: config[:try_to_lock_timeout],
@@ -151,16 +156,13 @@ def lock(
   retry_delay: config[:retry_delay],
   retry_jitter: config[:retry_jitter],
   raise_errors: false,
+  identity: uniq_identity, # (attr_accessor) calculated during client instantiation via config[:uniq_identifier] proc;
   &block
 )
 ```
 
 - `lock_name` - `[String]`
   - Lock name to be obtained.
-- `process_id` - `[Integer,String]`
-  - The process that want to acquire the lock.
-- `thread_id` - `[Integer,String]`
-  - The process's thread that want to acquire the lock.
 - `ttl` [Integer]
   - Lock's time to live (in milliseconds).
 - `queue_ttl` - `[Integer]`
@@ -177,6 +179,12 @@ def lock(
   - See RedisQueuedLocks::Instrument::ActiveSupport for example.
 - `raise_errors` - `[Boolean]`
   - Raise errors on library-related limits such as timeout or retry count limit.
+- `identity` - `[String]`
+  - An unique string that is unique per `RedisQueuedLock::Client` instance. Resolves the
+    collisions between the same process_id/thread_id/fiber_id/ractor_id identifiers on different
+    pods or/and nodes of your application;
+  - It is calculated once during `RedisQueuedLock::Client` instantiation and stored in `@uniq_identity`
+    ivar (accessed via `uniq_dentity` accessor method);
 - `block` - `[Block]`
   - A block of code that should be executed after the successfully acquired lock.
   - If block is **passed** the obtained lock will be released after the block execution or it's ttl (what will happen first);
@@ -214,14 +222,13 @@ Return value:
 ```ruby
 def lock!(
   lock_name,
-  process_id: RedisQueuedLocks::Resource.get_process_id,
-  thread_id: RedisQueuedLocks::Resource.get_thread_id,
   ttl: config[:default_lock_ttl],
   queue_ttl: config[:default_queue_ttl],
   timeout: config[:default_timeout],
   retry_count: config[:retry_count],
   retry_delay: config[:retry_delay],
   retry_jitter: config[:retry_jitter],
+  identity: uniq_identity,
   &block
 )
 ```
@@ -236,7 +243,7 @@ See `#lock` method [documentation](#lock---obtain-a-lock).
 - returns `nil` if lock does not exist;
 - lock data (`Hash<Symbol,String|Integer>`):
   - `lock_key` - `string` - lock key in redis;
-  - `acq_id` - `string` - acquier identifier (process_id/thread_id by default);
+  - `acq_id` - `string` - acquier identifier (process_id/thread_id/fiber_id/ractor_id/identity by default);
   - `ts` - `integer`/`epoch` - the time lock was obtained;
   - `init_ttl` - `integer` - (milliseconds) initial lock key ttl;
   - `rem_ttl` - `integer` - (milliseconds) remaining lock key ttl;
@@ -267,7 +274,7 @@ rql.lock_info("your_lock_name")
 - lock queue data (`Hash<Symbol,String|Array<Hash<Symbol,String|Numeric>>`):
   - `lock_queue` - `string` - lock queue key in redis;
   - `queue` - `array` - an array of lock requests (array of hashes):
-    - `acq_id` - `string` - acquier identifier (process_id/thread_id by default);
+    - `acq_id` - `string` - acquier identifier (process_id/thread_id/fiber_id/ractor_id/identity by default);
     - `score` - `float`/`epoch` - time when the lock request was made (epoch);
 
 ```ruby
@@ -277,9 +284,9 @@ rql.queue_info("your_lock_name")
 {
   lock_queue: "rql:lock_queue:your_lock_name",
   queue: [
-    { acq_id: "rql:acq:123/456", score: 1},
-    { acq_id: "rql:acq:123/567", score: 2},
-    { acq_id: "rql:acq:555/329", score: 3},
+    { acq_id: "rql:acq:123/456/567/678/fa76df9cc2", score: 1},
+    { acq_id: "rql:acq:123/567/456/679/c7bfcaf4f9", score: 2},
+    { acq_id: "rql:acq:555/329/523/127/7329553b11", score: 3},
     # ...etc
   ]
 }

data/lib/redis_queued_locks/acquier.rb

@@ -34,9 +34,13 @@ module RedisQueuedLocks::Acquier
     # @param lock_name [String]
     #   Lock name to be acquier.
     # @option process_id [Integer,String]
-    #   The process that want to acquire the lock.
+    #   The process that want to acquire a lock.
     # @option thread_id [Integer,String]
-    #   The process's thread that want to acquire the lock.
+    #   The process's thread that want to acquire a lock.
+    # @option fiber_id [Integer,String]
+    #   A current fiber that want to acquire a lock.
+    # @option ractor_id [Integer,String]
+    #   The current ractor that want to acquire a lock.
     # @option ttl [Integer,NilClass]
     #   Lock's time to live (in milliseconds). Nil means "without timeout".
     # @option queue_ttl [Integer]
@@ -53,6 +57,10 @@ module RedisQueuedLocks::Acquier
     #   Raise errors on exceptional cases.
     # @option instrumenter [#notify]
     #   See RedisQueuedLocks::Instrument::ActiveSupport for example.
+    # @option identity [String]
+    #   Unique acquire identifier that is also should be unique between processes and pods
+    #   on different machines. By default the uniq identity string is
+    #   represented as 10 bytes hexstr.
     # @param [Block]
     #   A block of code that should be executed after the successfully acquired lock.
     # @return [Hash<Symbol,Any>]
@@ -66,6 +74,8 @@ module RedisQueuedLocks::Acquier
       lock_name,
       process_id:,
       thread_id:,
+      fiber_id:,
+      ractor_id:,
       ttl:,
       queue_ttl:,
       timeout:,
@@ -74,10 +84,17 @@ module RedisQueuedLocks::Acquier
       retry_jitter:,
       raise_errors:,
       instrumenter:,
+      identity:,
       &block
     )
       # Step 1: prepare lock requirements (generate lock name, calc lock ttl, etc).
-      acquier_id = RedisQueuedLocks::Resource.acquier_identifier(process_id, thread_id)
+      acquier_id = RedisQueuedLocks::Resource.acquier_identifier(
+        process_id,
+        thread_id,
+        fiber_id,
+        ractor_id,
+        identity
+      )
       lock_ttl = ttl + REDIS_EXPIRATION_DEVIATION
       lock_key = RedisQueuedLocks::Resource.prepare_lock_key(lock_name)
       lock_key_queue = RedisQueuedLocks::Resource.prepare_lock_queue(lock_name)

data/lib/redis_queued_locks/client.rb

@@ -17,6 +17,7 @@ class RedisQueuedLocks::Client
     setting :default_queue_ttl, 15 # NOTE: seconds
     setting :lock_release_batch_size, 100
     setting :instrumenter, RedisQueuedLocks::Instrument::VoidNotifier
+    setting :uniq_identifier, -> { RedisQueuedLocks::Resource.calc_uniq_identity }
 
     # TODO: setting :logger, Logger.new(IO::NULL)
     # TODO: setting :debug, true/false
@@ -30,6 +31,7 @@ class RedisQueuedLocks::Client
     validate('default_queue_ttl', :integer)
     validate('lock_release_batch_size', :integer)
     validate('instrumenter') { |val| RedisQueuedLocks::Instrument.valid_interface?(val) }
+    validate('uniq_identifier', :proc)
   end
 
   # @return [RedisClient]
@@ -38,6 +40,12 @@ class RedisQueuedLocks::Client
   # @since 0.1.0
   attr_reader :redis_client
 
+  # @return [String]
+  #
+  # @api private
+  # @since 0.1.0
+  attr_accessor :uniq_identity
+
   # @param redis_client [RedisClient]
   #   Redis connection manager, which will be used for the lock acquierment and distribution.
   #   It should be an instance of RedisClient.
@@ -49,15 +57,12 @@ class RedisQueuedLocks::Client
   # @since 0.1.0
   def initialize(redis_client, &configs)
     configure(&configs)
+    @uniq_identity = config[:uniq_identifier].call
     @redis_client = redis_client
   end
 
   # @param lock_name [String]
   #   Lock name to be obtained.
-  # @option process_id [Integer,String]
-  #   The process that want to acquire the lock.
-  # @option thread_id [Integer,String]
-  #   The process's thread that want to acquire the lock.
   # @option ttl [Integer]
   #   Lock's time to live (in milliseconds).
   # @option queue_ttl [Integer]
@@ -74,17 +79,19 @@ class RedisQueuedLocks::Client
   #   See RedisQueuedLocks::Instrument::ActiveSupport for example.
   # @option raise_errors [Boolean]
   #   Raise errors on library-related limits such as timeout or failed lock obtain.
+  # @option identity [String]
+  #   Unique acquire identifier that is also should be unique between processes and pods
+  #   on different machines. By default the uniq identity string is
+  #   represented as 10 bytes hexstr.
   # @param block [Block]
   #   A block of code that should be executed after the successfully acquired lock.
-  # @return [Hash<Symbol,Any>]
+  # @return [Hash<Symbol,Any>,yield]
   #   Format: { ok: true/false, result: Symbol/Hash }.
   #
   # @api public
   # @since 0.1.0
   def lock(
     lock_name,
-    process_id: RedisQueuedLocks::Resource.get_process_id,
-    thread_id: RedisQueuedLocks::Resource.get_thread_id,
     ttl: config[:default_lock_ttl],
     queue_ttl: config[:default_queue_ttl],
     timeout: config[:try_to_lock_timeout],
@@ -92,13 +99,16 @@ class RedisQueuedLocks::Client
     retry_delay: config[:retry_delay],
     retry_jitter: config[:retry_jitter],
     raise_errors: false,
+    identity: uniq_identity,
     &block
   )
     RedisQueuedLocks::Acquier.acquire_lock!(
       redis_client,
       lock_name,
-      process_id:,
-      thread_id:,
+      process_id: RedisQueuedLocks::Resource.get_process_id,
+      thread_id: RedisQueuedLocks::Resource.get_thread_id,
+      fiber_id: RedisQueuedLocks::Resource.get_fiber_id,
+      ractor_id: RedisQueuedLocks::Resource.get_ractor_id,
       ttl:,
       queue_ttl:,
       timeout:,
@@ -107,6 +117,7 @@ class RedisQueuedLocks::Client
       retry_jitter:,
       raise_errors:,
       instrumenter: config[:instrumenter],
+      identity:,
       &block
     )
   end
@@ -117,20 +128,17 @@ class RedisQueuedLocks::Client
   # @since 0.1.0
   def lock!(
     lock_name,
-    process_id: RedisQueuedLocks::Resource.get_process_id,
-    thread_id: RedisQueuedLocks::Resource.get_thread_id,
     ttl: config[:default_lock_ttl],
     queue_ttl: config[:default_queue_ttl],
     timeout: config[:default_timeout],
     retry_count: config[:retry_count],
     retry_delay: config[:retry_delay],
     retry_jitter: config[:retry_jitter],
+    identity: uniq_identity,
     &block
   )
     lock(
       lock_name,
-      process_id:,
-      thread_id:,
       ttl:,
       queue_ttl:,
       timeout:,
@@ -138,6 +146,7 @@ class RedisQueuedLocks::Client
       retry_delay:,
       retry_jitter:,
       raise_errors: true,
+      identity:,
       &block
     )
   end
@@ -148,11 +157,7 @@ class RedisQueuedLocks::Client
   # @api public
   # @since 0.1.0
   def unlock(lock_name)
-    RedisQueuedLocks::Acquier.release_lock!(
-      redis_client,
-      lock_name,
-      config[:instrumenter]
-    )
+    RedisQueuedLocks::Acquier.release_lock!(redis_client, lock_name, config[:instrumenter])
   end
 
   # @param lock_name [String]
@@ -197,11 +202,7 @@ class RedisQueuedLocks::Client
   # @api public
   # @since 0.1.0
   def clear_locks(batch_size: config[:lock_release_batch_size])
-    RedisQueuedLocks::Acquier.release_all_locks!(
-      redis_client,
-      batch_size,
-      config[:instrumenter]
-    )
+    RedisQueuedLocks::Acquier.release_all_locks!(redis_client, batch_size, config[:instrumenter])
   end
 end
 # rubocop:enable Metrics/ClassLength

data/lib/redis_queued_locks/resource.rb

@@ -16,14 +16,29 @@ module RedisQueuedLocks::Resource
   LOCK_QUEUE_PATTERN = 'rql:lock_queue:*'
 
   class << self
+    # Returns 10-byte unique identifier. It is used for uniquely
+    # identify current process between different nodes/pods of your application
+    # during the lock obtaining and self-identifying in the lock queue.
+    #
+    # @return [String]
+    #
+    # @api private
+    # @since 0.1.0
+    def calc_uniq_identity
+      SecureRandom.hex(5)
+    end
+
     # @param process_id [Integer,String]
     # @param thread_id [Integer,String]
+    # @param fiber_id [Integer,String]
+    # @param ractor_id [Integer,String]
+    # @param identity [String]
     # @return [String]
     #
     # @api private
     # @since 0.1.0
-    def acquier_identifier(process_id = get_process_id, thread_id = get_thread_id)
-      "rql:acq:#{process_id}/#{thread_id}"
+    def acquier_identifier(process_id, thread_id, fiber_id, ractor_id, identity)
+      "rql:acq:#{process_id}/#{thread_id}/#{fiber_id}/#{ractor_id}/#{identity}"
     end
 
     # @param lock_name [String]
@@ -79,6 +94,22 @@ module RedisQueuedLocks::Resource
       ::Thread.current.object_id
     end
 
+    # @return [Integer]
+    #
+    # @api private
+    # @since 0.1.0
+    def get_fiber_id
+      ::Fiber.current.object_id
+    end
+
+    # @return [Integer]
+    #
+    # @api private
+    # @since 0.1.0
+    def get_ractor_id
+      ::Ractor.current.object_id
+    end
+
     # @return [Integer]
     #
     # @api private

data/lib/redis_queued_locks/version.rb

@@ -5,6 +5,6 @@ module RedisQueuedLocks
   #
   # @api public
   # @since 0.0.1
-  # @version 0.0.8
-  VERSION = '0.0.8'
+  # @version 0.0.9
+  VERSION = '0.0.9'
 end

data/lib/redis_queued_locks.rb

@@ -3,6 +3,7 @@
 require 'redis-client'
 require 'qonfig'
 require 'timeout'
+require 'securerandom'
 
 # @api public
 # @since 0.1.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis_queued_locks
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Rustam Ibragimov