inst-jobs 2.4.4 → 2.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90e78e46299d111959e7e48f25fe4e05a7939c6fb54fcd423deff4b960e79e6c
-  data.tar.gz: 20963910cd2cb1856f73cabbdc1547131a0d5096e26f7cc444f0a6e7d26b0ded
+  metadata.gz: 3fa880428987cbea8be8cb706b2b4d4fae3164a021107591e7e1f5724a88fc4b
+  data.tar.gz: f9feb618c4043c02ce428146d9bc1801884639d72867e23f21c5b39b546c6a7f
 SHA512:
-  metadata.gz: 22155dba3fd9f1201e67930be8a3cc488da21b02b2066b59fe9a0f28f5670393534ddbb87a937979df356ba602c23a27e97f7650463fa2eb7c53e76647df5f02
-  data.tar.gz: 41a6bec7f263657aac33b62eeb8169db1898dfdcdbfadc32d91a985f54cb037a5691d75f02dff80b9c80ea57387a746fa70e6710545fe6b9c12724dde9f8f720
+  metadata.gz: 9328098d390744e089edb857db0f27d379f3696f66c8c549655e6a9a5ea331e7083dda3eb3203200fb00ca1edf121a1264b7ffb228ea075f43889c8a20f7d02c
+  data.tar.gz: f6dfe1ad5d03c525daf9e445764bb191cdd6075d0c36156d3ff1499c7fb149718b4d5bb689da16349e49e9b1c25bb1e468ceed7e7cfa30543ce831047a7bd954

data/lib/delayed/backend/active_record.rb

@@ -38,6 +38,11 @@ module Delayed
             job = new(attributes, &block)
             job.single_step_create(on_conflict: on_conflict)
           end
+
+          def attempt_advisory_lock(lock_name)
+            fn_name = connection.quote_table_name("half_md5_as_bigint")
+            connection.select_value("SELECT pg_try_advisory_xact_lock(#{fn_name}('#{lock_name}'));")
+          end
         end
 
         def single_step_create(on_conflict: nil)

data/lib/delayed/backend/base.rb

@@ -148,13 +148,19 @@ module Delayed
         end
 
         def unlock_orphaned_prefetched_jobs
-          horizon = db_time_now - (Settings.parent_process[:prefetched_jobs_timeout] * 4)
-          orphaned_jobs = running_jobs.select do |job|
-            job.locked_by.start_with?("prefetch:") && job.locked_at < horizon
-          end
-          return 0 if orphaned_jobs.empty?
+          transaction do
+            # for db performance reasons, we only need one process doing this at a time
+            # so if we can't get an advisory lock, just abort. we'll try again soon
+            return unless attempt_advisory_lock("Delayed::Job.unlock_orphaned_prefetched_jobs")
+
+            horizon = db_time_now - (Settings.parent_process[:prefetched_jobs_timeout] * 4)
+            orphaned_jobs = running_jobs.select do |job|
+              job.locked_by.start_with?("prefetch:") && job.locked_at < horizon
+            end
+            return 0 if orphaned_jobs.empty?
 
-          unlock(orphaned_jobs)
+            unlock(orphaned_jobs)
+          end
         end
 
         def unlock_orphaned_jobs(pid = nil, name = nil)

data/lib/delayed/periodic.rb

@@ -33,7 +33,13 @@ module Delayed
       # we used to queue up a job in a strand here, and perform the audit inside that job
       # however, now that we're using singletons for scheduling periodic jobs,
       # it's fine to just do the audit in-line here without risk of creating duplicates
-      perform_audit!
+      Delayed::Job.transaction do
+        # for db performance reasons, we only need one process doing this at a time
+        # so if we can't get an advisory lock, just abort. we'll try again soon
+        return unless Delayed::Job.attempt_advisory_lock("Delayed::Periodic#audit_queue")
+
+        perform_audit!
+      end
     end
 
     # make sure all periodic jobs are scheduled for their next run in the job queue

data/lib/delayed/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Delayed
-  VERSION = "2.4.4"
+  VERSION = "2.4.5"
 end

data/lib/delayed/worker/health_check.rb

@@ -33,7 +33,7 @@ module Delayed
             # and we try to get an advisory lock when it runs.  If we succeed,
             # no other worker is trying to do this right now (and if we abandon the
             # operation, the transaction will end, releasing the advisory lock).
-            result = attempt_advisory_lock
+            result = Delayed::Job.attempt_advisory_lock("Delayed::Worker::HealthCheck#reschedule_abandoned_jobs")
             return unless result
 
             checker = Worker::HealthCheck.build(
@@ -65,13 +65,6 @@ module Delayed
             end
           end
         end
-
-        def attempt_advisory_lock
-          lock_name = "Delayed::Worker::HealthCheck#reschedule_abandoned_jobs"
-          conn = ActiveRecord::Base.connection
-          fn_name = conn.quote_table_name("half_md5_as_bigint")
-          conn.select_value("SELECT pg_try_advisory_xact_lock(#{fn_name}('#{lock_name}'));")
-        end
       end
 
       attr_accessor :config, :worker_name

data/spec/delayed/worker/health_check_spec.rb

@@ -111,7 +111,7 @@ RSpec.describe Delayed::Worker::HealthCheck do
     end
 
     it "bails immediately if advisory lock already taken" do
-      allow(described_class).to receive(:attempt_advisory_lock).and_return(false)
+      allow(Delayed::Job).to receive(:attempt_advisory_lock).and_return(false)
       described_class.reschedule_abandoned_jobs
       @dead_job.reload
       expect(@dead_job.run_at.to_i).to eq(initial_run_at.to_i)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inst-jobs
 version: !ruby/object:Gem::Version
-  version: 2.4.4
+  version: 2.4.5
 platform: ruby
 authors:
 - Tobias Luetke
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-18 00:00:00.000000000 Z
+date: 2021-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord