1 files changed, 36 insertions, 4 deletions
diff --git a/spec/lib/gitlab/database/async_indexes/index_destructor_spec.rb b/spec/lib/gitlab/database/async_indexes/index_destructor_spec.rb
index 11039ad4f7e..7f0febdcacd 100644
--- a/spec/lib/gitlab/database/async_indexes/index_destructor_spec.rb
+++ b/spec/lib/gitlab/database/async_indexes/index_destructor_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Gitlab::Database::AsyncIndexes::IndexDestructor do
+RSpec.describe Gitlab::Database::AsyncIndexes::IndexDestructor, feature_category: :database do
   include ExclusiveLeaseHelpers
 
   describe '#perform' do
@@ -16,7 +16,7 @@ RSpec.describe Gitlab::Database::AsyncIndexes::IndexDestructor do
     let(:connection) { model.connection }
 
     let!(:lease) { stub_exclusive_lease(lease_key, :uuid, timeout: lease_timeout) }
-    let(:lease_key) { "gitlab/database/indexing/actions/#{Gitlab::Database::PRIMARY_DATABASE_NAME}" }
+    let(:lease_key) { "gitlab/database/asyncddl/actions/#{Gitlab::Database::PRIMARY_DATABASE_NAME}" }
     let(:lease_timeout) { described_class::TIMEOUT_PER_ACTION }
 
     before do
@@ -39,6 +39,24 @@ RSpec.describe Gitlab::Database::AsyncIndexes::IndexDestructor do
 
         subject.perform
       end
+
+      it 'removes the index preparation record from postgres_async_indexes' do
+        expect(async_index).to receive(:destroy!).and_call_original
+
+        expect { subject.perform }.to change { index_model.count }.by(-1)
+      end
+
+      it 'logs an appropriate message' do
+        expected_message = 'Skipping index removal since preconditions are not met. The queuing entry will be deleted'
+
+        allow(Gitlab::AppLogger).to receive(:info).and_call_original
+
+        subject.perform
+
+        expect(Gitlab::AppLogger)
+          .to have_received(:info)
+          .with(a_hash_including(message: expected_message))
+      end
     end
 
     it 'creates the index while controlling lock timeout' do
@@ -53,7 +71,7 @@ RSpec.describe Gitlab::Database::AsyncIndexes::IndexDestructor do
     end
 
     it 'removes the index preparation record from postgres_async_indexes' do
-      expect(async_index).to receive(:destroy).and_call_original
+      expect(async_index).to receive(:destroy!).and_call_original
 
       expect { subject.perform }.to change { index_model.count }.by(-1)
     end
@@ -61,9 +79,23 @@ RSpec.describe Gitlab::Database::AsyncIndexes::IndexDestructor do
     it 'skips logic if not able to acquire exclusive lease' do
       expect(lease).to receive(:try_obtain).ordered.and_return(false)
       expect(connection).not_to receive(:execute).with(/DROP INDEX/)
-      expect(async_index).not_to receive(:destroy)
+      expect(async_index).not_to receive(:destroy!)
 
       expect { subject.perform }.not_to change { index_model.count }
     end
+
+    it 'logs messages around execution' do
+      allow(Gitlab::AppLogger).to receive(:info).and_call_original
+
+      subject.perform
+
+      expect(Gitlab::AppLogger)
+        .to have_received(:info)
+        .with(a_hash_including(message: 'Starting async index removal'))
+
+      expect(Gitlab::AppLogger)
+        .to have_received(:info)
+        .with(a_hash_including(message: 'Finished async index removal'))
+    end
   end
 end