good_job 3.15.1 → 3.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95ede69036445ced25b5afed25912ce509a171d7311e7a5c2c91d3b9615c0482
-  data.tar.gz: 141500358218a98d7e84b5415b1f1d8afb92243a5695928370b5497906716ae3
+  metadata.gz: 4674d611fd466270ee2bb79b4763848bced81ed16ae227dc05e0daca00b5672e
+  data.tar.gz: 40dda31aa1e21e6b16e4f2582354d572af271ebe270b80e6cbfceec95873f5da
 SHA512:
-  metadata.gz: 997b09e9a348d9b11fd67521a54222909f4e495ecede63bcc253473e4a8544fdaa40f3e77171dbbb35692f8f1f77290b51cbf80bfc50817422f94efdbed3c83a
-  data.tar.gz: f64e80caca4d1c31449af26e146b77a0d71c53ca09bc2c8370c0190daafe0565380d0bc60ca42fb20a84e5be41c50c23b7f4b4c0674f69a3bff47c5c43fcf537
+  metadata.gz: 73ae44f8b88e70d4cfd98473920af572320157432f121b437f99718ca2182fa88d98b7f3dd4a3aec0319b6f2ddd51eb5eed1fe0290f94b605a4b9b7fedf53cc6
+  data.tar.gz: 932c23ebe5722a3a8d7638db77bfeefd350c219a071b8b96982cd19ad78319c2ddd3f7b178d3ebb59b7d670caf7b265c01b254c2481d13a7a6f0521f0d172c82

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [v3.15.2](https://github.com/bensheldon/good_job/tree/v3.15.2) (2023-04-19)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v3.15.1...v3.15.2)
+
+**Closed issues:**
+
+- Cleaning up preserved jobs giving me timeout [\#933](https://github.com/bensheldon/good_job/issues/933)
+- uninitialized constant GoodJob::ActiveJobJob \(NameError\) [\#932](https://github.com/bensheldon/good_job/issues/932)
+
+**Merged pull requests:**
+
+- Use batched queries in `GoodJob::self.cleanup_preserved_jobs` [\#934](https://github.com/bensheldon/good_job/pull/934) ([bensheldon](https://github.com/bensheldon))
+- Bump nokogiri from 1.14.2 to 1.14.3 [\#926](https://github.com/bensheldon/good_job/pull/926) ([dependabot[bot]](https://github.com/apps/dependabot))
+
 ## [v3.15.1](https://github.com/bensheldon/good_job/tree/v3.15.1) (2023-04-17)
 
 [Full Changelog](https://github.com/bensheldon/good_job/compare/v3.15.0...v3.15.1)

data/lib/good_job/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module GoodJob
   # GoodJob gem version.
-  VERSION = '3.15.1'
+  VERSION = '3.15.2'
 end

data/lib/good_job.rb

@@ -162,22 +162,33 @@ module GoodJob
   # destroy old records and preserve space in your database.
   # @param older_than [nil,Numeric,ActiveSupport::Duration] Jobs older than this will be destroyed (default: +86400+).
   # @return [Integer] Number of job execution records and batches that were destroyed.
-  def self.cleanup_preserved_jobs(older_than: nil)
+  def self.cleanup_preserved_jobs(older_than: nil, in_batches_of: 1_000)
     older_than ||= GoodJob.configuration.cleanup_preserved_jobs_before_seconds_ago
     timestamp = Time.current - older_than
     include_discarded = GoodJob.configuration.cleanup_discarded_jobs?
 
     ActiveSupport::Notifications.instrument("cleanup_preserved_jobs.good_job", { older_than: older_than, timestamp: timestamp }) do |payload|
-      old_jobs = GoodJob::Job.where('finished_at <= ?', timestamp)
-      old_jobs = old_jobs.succeeded unless include_discarded
-      deleted_executions_count = GoodJob::Execution.where(job: old_jobs).delete_all
+      deleted_executions_count = 0
+      deleted_batches_count = 0
+
+      jobs_query = GoodJob::Job.where('finished_at <= ?', timestamp).order(finished_at: :asc).limit(in_batches_of)
+      jobs_query = jobs_query.succeeded unless include_discarded
+      loop do
+        deleted = GoodJob::Execution.where(job: jobs_query).delete_all
+        break if deleted.zero?
+
+        deleted_executions_count += deleted
+      end
 
       if GoodJob::BatchRecord.migrated?
-        old_batches = GoodJob::BatchRecord.where('finished_at <= ?', timestamp)
-        old_batches = old_batches.succeeded unless include_discarded
-        deleted_batches_count = old_batches.delete_all
-      else
-        deleted_batches_count = 0
+        batches_query = GoodJob::BatchRecord.where('finished_at <= ?', timestamp).limit(in_batches_of)
+        batches_query = batches_query.succeeded unless include_discarded
+        loop do
+          deleted = batches_query.delete_all
+          break if deleted.zero?
+
+          deleted_batches_count += deleted
+        end
       end
 
       payload[:destroyed_executions_count] = deleted_executions_count

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: good_job
 version: !ruby/object:Gem::Version
-  version: 3.15.1
+  version: 3.15.2
 platform: ruby
 authors:
 - Ben Sheldon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-17 00:00:00.000000000 Z
+date: 2023-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob