inst-jobs 2.1.3 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c31ed6d846425c9bf022bb8c744681019cbf0f0192d4e0ee7f0a5d7dc44a65c
-  data.tar.gz: 4a5b940ba8bd6770209d93e20ccc217d4ab5915bcd1a5791de70b076e7cecf97
+  metadata.gz: c062c222e731bd490efe572108a508bf78faabee4479f7fe6927a89688d9ef0b
+  data.tar.gz: 3b1678fc017230e990bc7e8d4e652c23ab59413953ce72a312b13adfa7626193
 SHA512:
-  metadata.gz: 07377763c26979774add4b3445aa72ebc2cbff6aabe595e1157c883a90dea48407bc8ecb87f5532265178a96b27548caaf5ce13a0789c469272980bc864a2882
-  data.tar.gz: 7ddd291e18be337ae1d858d016af92cc255c111e5141eafca8cee598fcdae9563a74983ba6b98daeb50c1fe599490dd9c962e1c722d5dcea5083bf16a619641d
+  metadata.gz: 8c1a722c17c9abc8f5c8a44cb28f6584dc9fb16c1edcccc8df566ad21a5f81af7a54fb70282e2689aee11947dcd96f44ca01dfe542d71c8d3d6b7f145a572ce7
+  data.tar.gz: 9a7a65c71820d4b04f1e1ac2bf498cf030490a597d075d87d4399a392a7da1bbf50cfb3d5eeb1dea9c357d11e00aabf5e469f062c1fe9cc4b02cc8ed08e1a192

data/lib/delayed/periodic.rb

@@ -53,18 +53,12 @@ class Periodic
   end
 
   def enqueue_args
-    # yes, checking for whether it is actually the boolean literal false,
-    # which means the consuming code really does not want this job to be
-    # a singleton at all.
-    non_singleton_periodic_job = @job_args[:singleton] == false
     inferred_args = {
       max_attempts: 1,
       run_at: @cron.next_time(Delayed::Periodic.now).utc.to_time,
-      singleton: (non_singleton_periodic_job ? nil : tag)
+      singleton: tag,
+      on_conflict: :patient
     }
-    unless non_singleton_periodic_job
-      inferred_args[:on_conflict] = :patient
-    end
     @job_args.merge(inferred_args)
   end
 

data/lib/delayed/pool.rb

@@ -39,6 +39,7 @@ class Pool
     Process.wait unlock_pid
 
     spawn_periodic_auditor
+    spawn_abandoned_job_cleanup
     spawn_all_workers
     say "Workers spawned"
     join
@@ -111,6 +112,34 @@ class Pool
     end
   end
 
+  def spawn_abandoned_job_cleanup
+    return if Settings.disable_abandoned_job_cleanup
+    cleanup_interval_in_minutes = 60
+    @abandoned_cleanup_thread = Thread.new do
+      # every hour (staggered by process)
+      # check for dead jobs and cull them.
+      # Will actually be more often based on the
+      # number of worker nodes in the pool.  This will actually
+      # be a max of N times per hour where N is the number of workers,
+      # but they won't overrun each other because the health check
+      # takes an advisory lock internally
+      sleep(rand(cleanup_interval_in_minutes * 60))
+      loop do
+        schedule_abandoned_job_cleanup
+        sleep(cleanup_interval_in_minutes * 60)
+      end
+    end
+  end
+
+  def schedule_abandoned_job_cleanup
+    pid = fork_with_reconnects do
+      # we want to avoid db connections in the main pool process
+      $0 = "delayed_abandoned_job_cleanup"
+      Delayed::Worker::HealthCheck.reschedule_abandoned_jobs
+    end
+    workers[pid] = :abandoned_job_cleanup
+  end
+
   def spawn_periodic_auditor
     return if Settings.disable_periodic_jobs
 
@@ -217,6 +246,8 @@ class Pool
       case worker
       when :periodic_audit
         say "ran auditor: #{worker}"
+      when :abandoned_job_cleanup
+        say "ran cleanup: #{worker}"
       when :work_queue
         say "work queue exited, restarting", :info
         spawn_work_queue

data/lib/delayed/settings.rb

@@ -8,6 +8,7 @@ module Delayed
   module Settings
     SETTINGS = [
       :default_job_options,
+      :disable_abandoned_job_cleanup,
       :disable_periodic_jobs,
       :disable_automatic_orphan_unlocking,
       :fetch_batch_size,

data/lib/delayed/version.rb

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

data/lib/delayed/worker/health_check.rb

@@ -23,12 +23,13 @@ module Delayed
         def reschedule_abandoned_jobs
           return if Settings.worker_health_check_type == :none
           Delayed::Job.transaction do
-            # this job is a special case, and is not a singleton
+            # this action is a special case, and SHOULD NOT be a periodic job
             # because if it gets wiped out suddenly during execution
             # it can't go clean up it's abandoned self.  Therefore,
-            # we try to get an advisory lock when it runs.  If we succeed,
-            # no other job is trying to do this right now (and if we abandon the
-            # job, the transaction will end, releasing the advisory lock).
+            # we expect it to get run from it's own process forked from the job pool
+            # 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
             return unless result
             checker = Worker::HealthCheck.build(

data/spec/delayed/periodic_spec.rb

@@ -27,15 +27,5 @@ RSpec.describe Delayed::Periodic do
       expect(instance).to_not be_nil
       expect(instance.enqueue_args[:singleton]).to eq("periodic: just a test")
     end
-
-    it "uses no singleton if told to skip" do
-      Delayed::Periodic.cron job_name, '*/10 * * * *', {singleton: false} do
-        # no-op
-      end
-      instance = Delayed::Periodic.scheduled[job_name]
-      expect(instance).to_not be_nil
-      expect(instance.enqueue_args[:singleton]).to be_nil
-      Delayed::Periodic.perform_audit!
-    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inst-jobs
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.2.0
 platform: ruby
 authors:
 - Tobias Luetke
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-22 00:00:00.000000000 Z
+date: 2021-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord