honker 0.3.0-x86_64-linux → 0.3.2-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47065d5eaa801ccb1f5c23d66eb399e6a0a3c7d287685a43ffadd61abbfe7c1e
-  data.tar.gz: 353df199b5e7d340116251f7d5e1bbe6920a908d7302d32b21e6440cc4867934
+  metadata.gz: f966662968b429ecea71fdb79f88c08b50beaa34be9bc8a5e506d81c74a312e3
+  data.tar.gz: cf424b2a28504aa3ba63d67bccc8562c2be5d827ef751e3ce0291d9b23e28ed6
 SHA512:
-  metadata.gz: 88cac69ce1fa353ebcf0393543df3da455c97cf109be7e91c853a1dad018e1dcd00870d40b4df8faeceafa89134e213b75b2b90da73e26cc41b888aa74f9602c
-  data.tar.gz: 2aede2ac9f3c008ce592b665f3c84c3d653aa79bfd27765f7d80dc2289c8295c42df9e3b4bf5d68b3f3458926e94b69802fbe5c12ec7f193dc85105cfa3a6d2b
+  metadata.gz: c80c2ab142b77dd45228e160363afc298b88920e33813f20836b27f9212a4df9fbcfb683827d697cdbec55cf88f77df3f4d208fc60d11a188feb16a0373bea94
+  data.tar.gz: 78a05d3f803223c1d58d00a7616b2ab6e89cc3c2c84b9bbfc1a7437621ac884ce3be20ad4027c29b5a8f36b4c343cf5bdda4c91401e8341031f38b0b67e1c371

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.0"
+  VERSION = "0.3.2"
 end

data/lib/honker.rb

@@ -113,11 +113,11 @@ module Honker
   end
 
   class CoreWatcher
-    def initialize(db_path, extension_path, backend)
+    def initialize(db_path, extension_path, backend, watcher_poll_interval_ms)
       @lib = Fiddle.dlopen(extension_path)
       @open = Fiddle::Function.new(
-        @lib["honker_watcher_open"],
-        [Fiddle::TYPE_VOIDP, Fiddle::TYPE_VOIDP, Fiddle::TYPE_VOIDP, Fiddle::TYPE_SIZE_T],
+        @lib["honker_watcher_open_v2"],
+        [Fiddle::TYPE_VOIDP, Fiddle::TYPE_VOIDP, Fiddle::TYPE_LONG_LONG, Fiddle::TYPE_VOIDP, Fiddle::TYPE_SIZE_T],
         Fiddle::TYPE_VOIDP,
       )
       @wait = Fiddle::Function.new(
@@ -131,7 +131,13 @@ module Honker
         Fiddle::TYPE_VOID,
       )
       err = "\0" * 1024
-      @handle = @open.call(db_path.to_s, backend.to_s, err, err.bytesize)
+      @handle = @open.call(
+        db_path.to_s,
+        backend.to_s,
+        watcher_poll_interval_ms || 1,
+        err,
+        err.bytesize,
+      )
       return unless @handle.to_i.zero?
 
       raise ArgumentError, err.delete_suffix("\0").split("\0", 2).first
@@ -171,10 +177,14 @@ module Honker
     attr_reader :db
 
     def initialize(path, extension_path: nil, watcher_backend: nil,
+                   watcher_poll_interval_ms: nil,
                    extension_resolver: ExtensionResolver.new)
       unless watcher_backend.nil? || watcher_backend.is_a?(String)
         raise ArgumentError, "unknown watcher backend"
       end
+      unless watcher_poll_interval_ms.nil? || watcher_poll_interval_ms.to_i.positive?
+        raise ArgumentError, "watcher_poll_interval_ms must be positive"
+      end
 
       resolved_extension = extension_resolver.resolve(extension_path)
       @db = SQLite3::Database.new(path)
@@ -186,7 +196,7 @@ module Honker
       @db.enable_load_extension(false)
       @db.execute_batch(DEFAULT_PRAGMAS)
       @db.execute("SELECT honker_bootstrap()")
-      @watcher = CoreWatcher.new(path, resolved_extension, watcher_backend)
+      @watcher = CoreWatcher.new(path, resolved_extension, watcher_backend, watcher_poll_interval_ms)
     end
 
     def close

metadata

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