Merge pull request opf#15603 from opf/bug/ensure_discard_on_concurren…

…cy_error Makes sure jobs are eventually discarded when concurrency happens
l3dlp-sandbox · May 27, 2024 · 9b09a13 · 9b09a13
2 parents 62d0543 + 8c33cb5
commit 9b09a13
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 0 deletions.
diff --git a/app/workers/mails/reminder_job.rb b/app/workers/mails/reminder_job.rb
@@ -28,6 +28,12 @@
 
 class Mails::ReminderJob < Mails::DeliverJob
   include ::Notifications::WithMarkedNotifications
+  include GoodJob::ActiveJobExtensions::Concurrency
+
+  good_job_control_concurrency_with(
+    total_limit: 1,
+    key: -> { "#{self.class.name}-#{arguments.last}" }
+  )
 
   private
 

diff --git a/app/workers/notifications/create_date_alerts_notifications_job.rb b/app/workers/notifications/create_date_alerts_notifications_job.rb
@@ -28,6 +28,13 @@
 
 module Notifications
   class CreateDateAlertsNotificationsJob < ApplicationJob
+    include GoodJob::ActiveJobExtensions::Concurrency
+
+    good_job_control_concurrency_with(
+      total_limit: 1,
+      key: -> { "#{self.class.name}-#{arguments.last}" }
+    )
+
     def perform(user)
       return unless EnterpriseToken.allows_to?(:date_alerts)
 

diff --git a/app/workers/work_packages/progress/job.rb b/app/workers/work_packages/progress/job.rb
@@ -39,4 +39,8 @@ class WorkPackages::Progress::Job < ApplicationJob
     perform_limit: 1,
     key: -> { "WorkPackagesProgressJob" }
   )
+
+  retry_on GoodJob::ActiveJobExtensions::Concurrency::ConcurrencyExceededError,
+           wait: 5.minutes,
+           attempts: :unlimited
 end
diff --git a/modules/storages/app/workers/storages/health_status_mailer_job.rb b/modules/storages/app/workers/storages/health_status_mailer_job.rb
@@ -39,6 +39,10 @@ class HealthStatusMailerJob < ApplicationJob
       key: -> { "#{self.class.name}-#{arguments.last[:storage].id}" }
     )
 
+    retry_on GoodJob::ActiveJobExtensions::Concurrency::ConcurrencyExceededError,
+             wait: 5.minutes,
+             attempts: 3
+
     discard_on ActiveJob::DeserializationError
 
     def perform(storage:)

diff --git a/modules/storages/app/workers/storages/manage_storage_integrations_job.rb b/modules/storages/app/workers/storages/manage_storage_integrations_job.rb
@@ -46,6 +46,11 @@ class ManageStorageIntegrationsJob < ApplicationJob
       enqueue_limit: 1,
       perform_limit: 1
     )
+
+    retry_on GoodJob::ActiveJobExtensions::Concurrency::ConcurrencyExceededError,
+             wait: 5.minutes,
+             attempts: 3
+
     SINGLE_THREAD_DEBOUNCE_TIME = 4.seconds.freeze
     KEY = :manage_nextcloud_integration_job_debounce_happened_at
     CRON_JOB_KEY = :"Storages::ManageStorageIntegrationsJob"