honker 0.3.1-aarch64-linux → 0.3.2-aarch64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c38234e0838f535413deed4153dffd480b4cf37cd0f48f66d3e719987fc19f5d
-  data.tar.gz: '08c256f82beea177ade1375705a4dccb0b139759d49187e83cfb635ed65baadb'
+  metadata.gz: 33c55981d9fee54bdc95195926ab606cb3009256cc4b37be93da3b1c9df68094
+  data.tar.gz: b34e941647b41a46e79b2780c7694821d90920ce23cc020ad025c9f236667ca6
 SHA512:
-  metadata.gz: 7443aeb793659c4188f6cd5271301cb0ee1244e379e91eabf48bfa1957d9e0b9d8eea8cbccb461b68ee673b9a1116c3890ed527c38148ab9019aaa8e1ad5c650
-  data.tar.gz: b4f548ae7490587e6c16403242fd13c3bf1772caa1a19551c460edacb726e8c43220879acf77bc88baac4c9ff9ada33fe6649183c8812057706c9e7775a0ebc9
+  metadata.gz: d9ac00fb747fa76d436c1e9615ba3a0aae10b28a7f2b3b461df6c0a6973d6fceb32b4f99f7a6f50e71ff7f2515bc6d716bad18ab8eee6b22a52886a7879cf8a0
+  data.tar.gz: 194d1dd44b680abd5b42cb175291bd6785d2334680d24568f4fd4950201bc72ba126bc88ad2da77c418276175e0c0a4db33bb80d802d9466e5c397a460b2f11b

data/lib/honker/lock.rb

@@ -56,11 +56,11 @@ module Honker
 
     # Extend the TTL. Returns true if we still hold the lock; false if
     # it was stolen (the TTL elapsed and another owner acquired it).
-    # The underlying SQL is the same as `try_lock`, but keyed on our
-    # existing `(name, owner)` pair so it refreshes rather than blocks.
+    # Uses honker_lock_renew — honker_lock_acquire does not refresh
+    # expires_at for an existing (name, owner) row.
     def heartbeat(ttl_s:)
       @db.db.get_first_row(
-        "SELECT honker_lock_acquire(?, ?, ?)",
+        "SELECT honker_lock_renew(?, ?, ?)",
         [@name, @owner, ttl_s],
       )[0] == 1
     end

data/lib/honker/scheduler.rb

@@ -43,13 +43,13 @@ module Honker
     #
     # Idempotent by `name`; registering the same name twice replaces
     # the previous row.
-    def add(name:, queue:, cron: nil, schedule: nil, payload:, priority: 0, expires_s: nil)
+    def add(name:, queue:, cron: nil, schedule: nil, payload:, priority: 0, expires_s: nil, max_attempts: 3)
       expr = schedule || cron
       raise ArgumentError, "must provide cron: or schedule:" if expr.nil? || expr.empty?
 
       @db.db.get_first_row(
-        "SELECT honker_scheduler_register(?, ?, ?, ?, ?, ?)",
-        [name, queue, expr, JSON.dump(payload), priority, expires_s],
+        "SELECT honker_scheduler_register(?, ?, ?, ?, ?, ?, ?)",
+        [name, queue, expr, JSON.dump(payload), priority, expires_s, max_attempts],
       )
       @db.mark_updated
       nil
@@ -105,7 +105,7 @@ module Honker
 
     # Return every registered schedule with current state. Each entry
     # is a Hash with: name, queue, cron_expr, payload (JSON string),
-    # priority, expires_s, next_fire_at, enabled.
+    # priority, expires_s, next_fire_at, enabled, max_attempts.
     def list
       raw = @db.db.get_first_row("SELECT honker_scheduler_list()")[0]
       return [] if raw.nil? || raw.empty?
@@ -115,9 +115,10 @@ module Honker
 
     # Mutate fields in place. Pass only the kwargs you want changed
     # (omitting a kwarg leaves the field alone). `payload: nil`
-    # writes JSON null. Cron change recomputes next_fire_at from now.
+    # writes JSON null; `max_attempts: nil` resets to default 3.
+    # Cron change recomputes next_fire_at from now.
     # Returns true iff a row was updated.
-    def update(name, schedule: UNSET, cron: UNSET, payload: UNSET, priority: UNSET, expires_s: UNSET)
+    def update(name, schedule: UNSET, cron: UNSET, payload: UNSET, priority: UNSET, expires_s: UNSET, max_attempts: UNSET)
       expr = nil
       expr = schedule if schedule != UNSET
       expr = cron if expr.nil? && cron != UNSET
@@ -126,13 +127,16 @@ module Honker
       priority_arg = (priority == UNSET) ? nil : priority
       touch_expires = (expires_s == UNSET) ? 0 : 1
       expires_arg = (expires_s == UNSET) ? nil : expires_s
+      touch_max_attempts = (max_attempts == UNSET) ? 0 : 1
+      max_attempts_arg = (max_attempts == UNSET) ? nil : max_attempts
 
-      any_field = !expr.nil? || payload != UNSET || priority != UNSET || expires_s != UNSET
+      any_field = !expr.nil? || payload != UNSET || priority != UNSET || expires_s != UNSET || max_attempts != UNSET
       return false unless any_field
 
       n = @db.db.get_first_row(
-        "SELECT honker_scheduler_update(?, ?, ?, ?, ?, ?)",
-        [name, expr, payload_arg, priority_arg, expires_arg, touch_expires],
+        "SELECT honker_scheduler_update(?, ?, ?, ?, ?, ?, ?, ?)",
+        [name, expr, payload_arg, priority_arg, expires_arg, touch_expires,
+         max_attempts_arg, touch_max_attempts],
       )[0]
       @db.mark_updated if n.positive?
       n.positive?
@@ -187,18 +191,15 @@ module Honker
     def leader_loop(owner, stop_fn)
       last_heartbeat = monotonic_now
       until stop_fn.call
+        still_ours = lock_renew(LEADER_LOCK, owner, LOCK_TTL_S)
+        # IMPORTANT: if refresh failed, a new leader has the lock.
+        # Break out before ticking so we don't double-fire.
+        return unless still_ours
+
+        last_heartbeat = monotonic_now
         # tick errors escape up to `run`, which releases the lock in
         # its `ensure` before re-raising.
         tick
-        if monotonic_now - last_heartbeat >= HEARTBEAT_S
-          still_ours = lock_try_acquire(LEADER_LOCK, owner, LOCK_TTL_S)
-          # IMPORTANT: if refresh failed, a new leader has the lock.
-          # Break out of the leader loop so we don't double-fire. This
-          # is the bug the Rust binding fixed; don't reintroduce it.
-          return unless still_ours
-
-          last_heartbeat = monotonic_now
-        end
 
         wait_s = HEARTBEAT_S - (monotonic_now - last_heartbeat)
         wait_s = 0 if wait_s.negative?
@@ -239,6 +240,13 @@ module Honker
       )[0] == 1
     end
 
+    def lock_renew(name, owner, ttl_s)
+      @db.db.get_first_row(
+        "SELECT honker_lock_renew(?, ?, ?)",
+        [name, owner, ttl_s],
+      )[0] == 1
+    end
+
     def lock_release(name, owner)
       @db.db.get_first_row(
         "SELECT honker_lock_release(?, ?)",

data/lib/honker/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Honker
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: honker
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: aarch64-linux
 authors:
 - Russell Romney