From bf0ab3e0fac54515c13beef4ec09b0455f1bce67 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 26 Oct 2022 12:10:48 +0200
Subject: [PATCH] Fix vacuum scheduler missing lock, locks never expiring
 (#19458)

Remove vacuuming of orphaned preview cards
---
 app/lib/vacuum/media_attachments_vacuum.rb   | 2 +-
 app/lib/vacuum/preview_cards_vacuum.rb       | 9 ---------
 app/workers/scheduler/vacuum_scheduler.rb    | 2 +-
 config/initializers/sidekiq.rb               | 1 +
 spec/lib/vacuum/preview_cards_vacuum_spec.rb | 4 ----
 5 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/app/lib/vacuum/media_attachments_vacuum.rb b/app/lib/vacuum/media_attachments_vacuum.rb
index 7fb347ce4..7c0a85a9d 100644
--- a/app/lib/vacuum/media_attachments_vacuum.rb
+++ b/app/lib/vacuum/media_attachments_vacuum.rb
@@ -8,8 +8,8 @@ class Vacuum::MediaAttachmentsVacuum
   end
 
   def perform
-    vacuum_cached_files! if retention_period?
     vacuum_orphaned_records!
+    vacuum_cached_files! if retention_period?
   end
 
   private
diff --git a/app/lib/vacuum/preview_cards_vacuum.rb b/app/lib/vacuum/preview_cards_vacuum.rb
index 84ef100ed..14fdeda1c 100644
--- a/app/lib/vacuum/preview_cards_vacuum.rb
+++ b/app/lib/vacuum/preview_cards_vacuum.rb
@@ -9,7 +9,6 @@ class Vacuum::PreviewCardsVacuum
 
   def perform
     vacuum_cached_images! if retention_period?
-    vacuum_orphaned_records!
   end
 
   private
@@ -21,18 +20,10 @@ class Vacuum::PreviewCardsVacuum
     end
   end
 
-  def vacuum_orphaned_records!
-    orphaned_preview_cards.in_batches.destroy_all
-  end
-
   def preview_cards_past_retention_period
     PreviewCard.cached.where(PreviewCard.arel_table[:updated_at].lt(@retention_period.ago))
   end
 
-  def orphaned_preview_cards
-    PreviewCard.where('NOT EXISTS (SELECT 1 FROM preview_cards_statuses WHERE preview_cards_statuses.preview_card_id = preview_cards.id)').where(PreviewCard.arel_table[:created_at].lt(TTL.ago))
-  end
-
   def retention_period?
     @retention_period.present?
   end
diff --git a/app/workers/scheduler/vacuum_scheduler.rb b/app/workers/scheduler/vacuum_scheduler.rb
index ce88ff204..9544f808b 100644
--- a/app/workers/scheduler/vacuum_scheduler.rb
+++ b/app/workers/scheduler/vacuum_scheduler.rb
@@ -3,7 +3,7 @@
 class Scheduler::VacuumScheduler
   include Sidekiq::Worker
 
-  sidekiq_options retry: 0
+  sidekiq_options retry: 0, lock: :until_executed
 
   def perform
     vacuum_operations.each do |operation|
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index c1327053d..9d2abf074 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -35,4 +35,5 @@ SidekiqUniqueJobs.configure do |config|
   config.reaper_count    = 1000
   config.reaper_interval = 600
   config.reaper_timeout  = 150
+  config.lock_ttl        = 50.days.to_i
 end
diff --git a/spec/lib/vacuum/preview_cards_vacuum_spec.rb b/spec/lib/vacuum/preview_cards_vacuum_spec.rb
index 4a4a599fa..275f9ba92 100644
--- a/spec/lib/vacuum/preview_cards_vacuum_spec.rb
+++ b/spec/lib/vacuum/preview_cards_vacuum_spec.rb
@@ -28,9 +28,5 @@ RSpec.describe Vacuum::PreviewCardsVacuum do
     it 'does not delete attached preview cards' do
       expect(new_preview_card.reload).to be_persisted
     end
-
-    it 'deletes preview cards not attached to any status' do
-      expect { orphaned_preview_card.reload }.to raise_error ActiveRecord::RecordNotFound
-    end
   end
 end