inst-jobs 3.1.16 → 3.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f72da158c53a425c974608dd30ca4f16f0c70071f3f159e16488b40677f2efe
-  data.tar.gz: a039610f1a50c70abaf4f2b36f81a19e748429cd3c675c7c789703d0ba1f8d02
+  metadata.gz: 8b4b6a00b5e6b9ec0916e799819a8ae75aac19faa368e869772b336f860a8109
+  data.tar.gz: 8f6a562afbf654e5937a5dc4d2540304ead783bab594722ca5c3b5782f6fdeb6
 SHA512:
-  metadata.gz: 6d5d65c583bd1e818918ffc927be4779129d556670d910dd7781a7c2c5be0d178e3315e1a8a1bfb1b0784d3b5b09be7b59187e402915c28a1e33fa726bad7c38
-  data.tar.gz: 2cfbe4d0840eae6ee31941dd8b0b8a681c07ab2b6dcc3c832198198eb02a146c6068f8f83081f31f03e0a93a763c9fdd5f62767e5ab1383e1214cbc84489d1e1
+  metadata.gz: 4bbd25cfe653768aa2a755eab2c3ea45530debba4d86e12b8d5a1cfd169ddf3d59fc0fef9773a0e81b2abaeaf886e0dd7be2a208c22fc0e0323fec77205e64e7
+  data.tar.gz: 9a61ada6fb4f816c0dadaf159f0852d4a31d933dff50ad7dfb5e8439e0dfc09ce9c3c1baf2dc24ab79f41fa79b6ea0b4f703d4903248d436b576924c629511a6

data/lib/delayed/backend/active_record.rb

@@ -47,11 +47,13 @@ module Delayed
 
           def attempt_advisory_lock(lock_name)
             fn_name = connection.quote_table_name("half_md5_as_bigint")
+            lock_name = connection.quote_string(lock_name)
             connection.select_value("SELECT pg_try_advisory_xact_lock(#{fn_name}('#{lock_name}'));")
           end
 
           def advisory_lock(lock_name)
             fn_name = connection.quote_table_name("half_md5_as_bigint")
+            lock_name = connection.quote_string(lock_name)
             connection.execute("SELECT pg_advisory_xact_lock(#{fn_name}('#{lock_name}'));")
           end
         end
@@ -409,7 +411,36 @@ module Delayed
                   RETURNING #{quoted_table_name}.*
                 SQL
 
-                jobs = find_by_sql(query)
+                begin
+                  jobs = find_by_sql(query)
+                rescue ::ActiveRecord::RecordNotUnique => e
+                  # if we got a unique violation on a singleton, it's because next_in_strand
+                  # somehow got set to true on the non-running job when there is a running
+                  # job. AFAICT this is not possible from inst-jobs itself, but has happened
+                  # in production - either due to manual manipulation of jobs, or possibly
+                  # a process in something like switchman-inst-jobs
+                  raise unless e.message.include?('"index_delayed_jobs_on_singleton_running"')
+
+                  # just repair the "strand"
+                  singleton = e.message.match(/Key \(singleton\)=\((.+)\) already exists.$/)[1]
+                  raise unless singleton
+
+                  transaction do
+                    # very conservatively lock the locked job, so that it won't unlock from underneath us and
+                    # leave an orphaned strand
+                    advisory_lock("singleton:#{singleton}")
+                    locked_jobs = where(singleton: singleton).where.not(locked_by: nil).lock.pluck(:id)
+                    # if it's already gone, then we're good and should be able to just retry
+                    if locked_jobs.length == 1
+                      updated = where(singleton: singleton, next_in_strand: true)
+                                .where(locked_by: nil)
+                                .update_all(next_in_strand: false)
+                      raise if updated.zero?
+                    end
+                  end
+
+                  retry
+                end
                 # because this is an atomic query, we don't have to return more jobs than we needed
                 # to try and lock them, nor is there a possibility we need to try again because
                 # all of the jobs we tried to lock had already been locked by someone else

data/lib/delayed/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inst-jobs
 version: !ruby/object:Gem::Version
-  version: 3.1.16
+  version: 3.1.17
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-04-01 00:00:00.000000000 Z
+date: 2024-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -130,20 +130,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -173,35 +159,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: diplomat
+  name: debug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.3
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: diplomat
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.6.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.6.3
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="