inst-jobs 2.4.5 → 2.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fa880428987cbea8be8cb706b2b4d4fae3164a021107591e7e1f5724a88fc4b
-  data.tar.gz: f9feb618c4043c02ce428146d9bc1801884639d72867e23f21c5b39b546c6a7f
+  metadata.gz: ba509dbe247e504537397a8482595ee6dbeac623c69141a24aa56f753343484f
+  data.tar.gz: 69502011608a6ac485012dd8ebc5ed9e616b8643ed92a297778100f9ddf51e15
 SHA512:
-  metadata.gz: 9328098d390744e089edb857db0f27d379f3696f66c8c549655e6a9a5ea331e7083dda3eb3203200fb00ca1edf121a1264b7ffb228ea075f43889c8a20f7d02c
-  data.tar.gz: f6dfe1ad5d03c525daf9e445764bb191cdd6075d0c36156d3ff1499c7fb149718b4d5bb689da16349e49e9b1c25bb1e468ceed7e7cfa30543ce831047a7bd954
+  metadata.gz: bba4b9a818f3ce3f0cae2f9d77a556c2d9770a47730328d7b3d6de5c8e5bc338ab24da4a4c5006d68375c9b8c24f24af04a0e711ee71d57b17526c0ca401e275
+  data.tar.gz: 8ccc1674c9d7f7b1caa27d759a34b9670bc298ece8d85472ba23b83e03cb672cff7372547a84d8c13363aa93447ff0249255f02e5353458d252ef77e1bc89b35

data/lib/delayed/backend/active_record.rb

@@ -463,9 +463,19 @@ module Delayed
           where("locked_by LIKE ?", "#{name}:%").pluck(:locked_by).map { |locked_by| locked_by.split(":").last.to_i }
         end
 
+        def self.prefetch_jobs_lock_name
+          "Delayed::Job.unlock_orphaned_prefetched_jobs"
+        end
+
         def self.unlock_orphaned_prefetched_jobs
-          horizon = db_time_now - (Settings.parent_process[:prefetched_jobs_timeout] * 4)
-          where("locked_by LIKE 'prefetch:%' AND locked_at<?", horizon).update_all(locked_at: nil, locked_by: nil)
+          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(prefetch_jobs_lock_name)
+
+            horizon = db_time_now - (Settings.parent_process[:prefetched_jobs_timeout] * 4)
+            where("locked_by LIKE 'prefetch:%' AND locked_at<?", horizon).update_all(locked_at: nil, locked_by: nil)
+          end
         end
 
         def self.unlock(jobs)

data/lib/delayed/backend/base.rb

@@ -148,19 +148,13 @@ module Delayed
         end
 
         def unlock_orphaned_prefetched_jobs
-          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)
+          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)
         end
 
         def unlock_orphaned_jobs(pid = nil, name = nil)

data/lib/delayed/version.rb

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

data/lib/delayed/work_queue/parent_process/server.rb

@@ -195,11 +195,13 @@ module Delayed
         def unlock_timed_out_prefetched_jobs
           @prefetched_jobs.each do |(worker_config, jobs)|
             next if jobs.empty?
+            next unless jobs.first.locked_at < Time.now.utc - Settings.parent_process[:prefetched_jobs_timeout]
 
-            if jobs.first.locked_at < Time.now.utc - Settings.parent_process[:prefetched_jobs_timeout]
+            Delayed::Job.transaction do
+              Delayed::Job.connection.execute("SELECT pg_advisory_xact_lock('#{Delayed::Job.prefetch_jobs_lock_name}')")
               Delayed::Job.unlock(jobs)
-              @prefetched_jobs[worker_config] = []
             end
+            @prefetched_jobs[worker_config] = []
           end
         end
 
@@ -207,7 +209,10 @@ module Delayed
           @prefetched_jobs.each do |(_worker_config, jobs)|
             next if jobs.empty?
 
-            Delayed::Job.unlock(jobs)
+            Delayed::Job.transaction do
+              Delayed::Job.connection.execute("SELECT pg_advisory_xact_lock('#{Delayed::Job.prefetch_jobs_lock_name}')")
+              Delayed::Job.unlock(jobs)
+            end
           end
           @prefetched_jobs = {}
         end

metadata

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