redis_queued_locks 0.0.26 → 0.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f699e402d9f382a72d2964ffe5d35b4d73b37a7c22f9f412fe08f9c7edd30cd7
-  data.tar.gz: aee1e0b45b2819ff2583ade2f51218a408dd7d734a415ec5c30f74de37d31511
+  metadata.gz: 5de2915b0828a1c82327dd301b41388cc649b2b922ca18f98cde7e8607753b28
+  data.tar.gz: da86f22a9ed5a834467ae80d9596c9efb0be1e645546c5b32a8f5d5b1dcec294
 SHA512:
-  metadata.gz: 3f5b756ebd9fe435e4f99602c9dc23d16142a73a1f06d3a6bf30edf61326224064ab66cf47f44d56af80a2cf3cdc2249f06064d93164922c8c236ba005ae4b49
-  data.tar.gz: e72b3d3edcbbe538597157ce4d23c9ff149ad4547d30f82b063323d80e20eac87a0c8cc2cdc24fb81414d115932e0f274253c0d22dd0e5a5d7b62b22f0276948
+  metadata.gz: 1f3a60c00b200f9e474ad0471e8e59541786f6e035df4c4d93d553eb93456fc99f0743970d3154fa8d3878a4e67b03d8d2ae2c16b71336b8d277f886dd4821e4
+  data.tar.gz: 1b52f00d36d568dce68b14caa0cbfb0e1ec793a7eec9adeb5bbca3c042b8bd224cec5f74488c4f0b34de0b302ec98392584a07e21bd02f106a370f3341ef3a35

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 ## [Unreleased]
 
+## [0.0.28] - 2024-03-21
+### Added
+- Logging: added `acq_id` to every log message;
+- Logging: updated documentation;
+
+## [0.0.27] - 2024-03-21
+### Changed
+- Better acquier position accuracy: acquier position in lock queue
+  should be represented as EPOCH in seconds+microseconds (previously: simply in seconds);
+
 ## [0.0.26] - 2024-03-21
 ### Added
 - Logging: add `acquier_id`;
@@ -14,7 +24,7 @@
 
 ## [0.0.23] - 2024-03-21
 ### Changed
-- Composed redis commands are invoked on the one conenction
+- Composed redis commands are invoked from the same *one* conenction
   (instead of mutiple connection fetching from redis connection pool on each redis command);
 
 ## [0.0.22] - 2024-03-21

data/README.md

@@ -139,15 +139,18 @@ clinet = RedisQueuedLocks::Client.new(redis_client) do |config|
   # - the logger object;
   # - should implement `debug(progname = nil, &block)` (minimal requirement) or be an instance of Ruby's `::Logger` class/subclass;
   # - at this moment the only debug logs are realised in 3 cases:
-  #   - start of lock obtaining: "[redis_queud_locks.start_lock_obtaining] lock_key => 'rql:lock:your_lock'"
-  #   - finish of the lock obtaining: "[redis_queued_locks.lock_obtained] lock_key => 'rql:lock:your_lock' acq_time => 123.456 (ms)"
-  #   - start of the lock expiration after `yield`: "[redis_queud_locks.expire_lock] lock_key => 'rql:lock:your_lock'"
+  #   - start of lock obtaining: "[redis_queud_locks.start_lock_obtaining] lock_key => 'rql:lock:your_lock' acq_id => 'rql:acq:54307/3620/3640/3540/c1799ede93'"
+  #   - finish of the lock obtaining: "[redis_queued_locks.lock_obtained] lock_key => 'rql:lock:your_lock' acq_id => 'rql:acq:54307/3620/3640/3540/c1799ede93' acq_time => 123.456 (ms)"
+  #   - start of the lock expiration after `yield`: "[redis_queud_locks.expire_lock] lock_key => 'rql:lock:your_lock' acq_id => 'rql:acq:54307/3620/3640/3540/c1799ede93'"
   # - by default uses VoidLogger that does nothing;
   config.logger = RedisQueuedLocks::Logging::VoidLogger
 
   # (default: false)
-  # - should be logged the each try of lock acquiring (a lot of logs can be generated depending on your retry configurations);
-  # - if logger is not cofnigured this option does not lead to any effect;
+  # - should be logged the each internal try-retry lock acquire (a lot of logs can be generated depending on your retry configurations);
+  # - it adds 2 cases to the log in addition to the existing 3:
+  #   - start of a try: "[redis_queud_locks.try_lock_start] lock_key => 'rql:lock:your_lock' acq_id => 'rql:acq:54307/3620/3640/3540/c1799ede93'"
+  #   - redis connection is feteched from the pool after "start of a try": "[redis_queued_locks.try_lock_rconn_fetched] lock_key => 'rql:lock:your_lock' acq_id => 'rql:acq:54307/3620/3640/3540/c1799ede93'"
+  # - if logger is not configured this option does not lead to any effect;
   config.log_lock_try = false
 end
 ```

data/lib/redis_queued_locks/acquier/acquire_lock/try_to_lock.rb

@@ -63,7 +63,7 @@ module RedisQueuedLocks::Acquier::AcquireLock::TryToLock
       rconn.multi(watch: [lock_key]) do |transact|
         # Fast-Step X0: fail-fast check
         if fail_fast && rconn.call('HGET', lock_key, 'acq_id')
-          # Fast-Step X1: is lock already obtained. fail fast - no try.
+          # Fast-Step X1: is lock already obtained. fail fast leads to "no try".
           inter_result = :fail_fast_no_try
         else
           # Step 1: add an acquier to the lock acquirement queue
@@ -147,7 +147,7 @@ module RedisQueuedLocks::Acquier::AcquireLock::TryToLock
                 'HSET',
                 lock_key,
                 'acq_id', acquier_id,
-                'ts', (timestamp = Time.now.to_i),
+                'ts', (timestamp = Time.now.to_f),
                 'ini_ttl', ttl
               )
 

data/lib/redis_queued_locks/acquier/acquire_lock/yield_with_expire.rb

@@ -9,6 +9,7 @@ module RedisQueuedLocks::Acquier::AcquireLock::YieldWithExpire
   # @param redis [RedisClient] Redis connection manager.
   # @param logger [::Logger,#debug] Logger object.
   # @param lock_key [String] Lock key to be expired.
+  # @param acquier_id [String] Acquier identifier.
   # @param timed [Boolean] Should the lock be wrapped by Tiemlout with with lock's ttl
   # @param ttl_shift [Float] Lock's TTL shifting. Should affect block's ttl. In millisecodns.
   # @param ttl [Integer,NilClass] Lock's time to live (in ms). Nil means "without timeout".
@@ -17,7 +18,7 @@ module RedisQueuedLocks::Acquier::AcquireLock::YieldWithExpire
   #
   # @api private
   # @since 0.1.0
-  def yield_with_expire(redis, logger, lock_key, timed, ttl_shift, ttl, &block)
+  def yield_with_expire(redis, logger, lock_key, acquier_id, timed, ttl_shift, ttl, &block)
     if block_given?
       if timed && ttl != nil
         timeout = ((ttl - ttl_shift) / 1000.0).yield_self { |time| (time < 0) ? 0.0 : time }
@@ -28,7 +29,11 @@ module RedisQueuedLocks::Acquier::AcquireLock::YieldWithExpire
     end
   ensure
     run_non_critical do
-      logger.debug("[redis_queued_locks.expire_lock] lock_key => '#{lock_key}'")
+      logger.debug(
+        "[redis_queued_locks.expire_lock] " \
+        "lock_key => '#{lock_key}' " \
+        "acq_id => '#{acquier_id}'"
+      )
     end
     redis.call('EXPIRE', lock_key, '0')
   end

data/lib/redis_queued_locks/acquier/acquire_lock.rb

@@ -176,7 +176,7 @@ module RedisQueuedLocks::Acquier::AcquireLock
               logger.debug(
                 "[redis_queued_locks.lock_obtained] " \
                 "lock_key => '#{result[:lock_key]}' " \
-                "acq_id: => '#{acquier_id}' " \
+                "acq_id => '#{acquier_id}' " \
                 "acq_time => #{acq_time} (ms)"
               )
             end
@@ -255,7 +255,7 @@ module RedisQueuedLocks::Acquier::AcquireLock
           begin
             yield_time = ::Process.clock_gettime(::Process::CLOCK_MONOTONIC)
             ttl_shift = ((yield_time - acq_process[:acq_end_time]) * 1000).ceil(2)
-            yield_with_expire(redis, logger, lock_key, timed, ttl_shift, ttl, &block)
+            yield_with_expire(redis, logger, lock_key, acquier_id, timed, ttl_shift, ttl, &block)
           ensure
             acq_process[:rel_time] = ::Process.clock_gettime(::Process::CLOCK_MONOTONIC)
             acq_process[:hold_time] = (

data/lib/redis_queued_locks/acquier/lock_info.rb

@@ -11,7 +11,7 @@ module RedisQueuedLocks::Acquier::LockInfo
     #   - result format: {
     #     lock_key: "rql:lock:your_lockname", # acquired lock key
     #     acq_id: "rql:acq:process_id/thread_id", # lock acquier identifier
-    #     ts: 123456789, # <locked at> time stamp (epoch)
+    #     ts: 123456789.2649841, # <locked at> time stamp (epoch, seconds.microseconds)
     #     ini_ttl: 123456789, # initial lock key ttl (milliseconds),
     #     rem_ttl: 123456789, # remaining lock key ttl (milliseconds)
     #   }
@@ -46,7 +46,7 @@ module RedisQueuedLocks::Acquier::LockInfo
           {
             lock_key: lock_key,
             acq_id: hget_cmd_res['acq_id'],
-            ts: Integer(hget_cmd_res['ts']),
+            ts: Float(hget_cmd_res['ts']),
             ini_ttl: Integer(hget_cmd_res['ini_ttl']),
             rem_ttl: ((pttl_cmd_res == -1) ? Infinity : pttl_cmd_res)
           }

data/lib/redis_queued_locks/resource.rb

@@ -65,21 +65,21 @@ module RedisQueuedLocks::Resource
       "rql:lock_queue:#{lock_name}"
     end
 
-    # @return [Integer] Redis's <Set> score that is calculated from the time (epoch) as an integer.
+    # @return [Float] Redis's <Set> score that is calculated from the time (epoch) as a float.
     #
     # @api private
     # @since 0.1.0
     def calc_initial_acquier_position
-      Time.now.to_i
+      Time.now.to_f
     end
 
     # @param queue_ttl [Integer] In seconds
-    # @return [Integer] Redis's <Set> score barrier before wich all other acquiers are removed.
+    # @return [Float] Redis's <Set> score barrier for acquiers that should be removed from queue.
     #
     # @api private
     # @since 0.1.0
     def acquier_dead_score(queue_ttl)
-      Time.now.to_i - queue_ttl
+      Time.now.to_f - queue_ttl
     end
 
     # @param lock_queue [String]

data/lib/redis_queued_locks/version.rb

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

metadata

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