1 files changed, 42 insertions, 15 deletions
diff --git a/spec/lib/gitlab/database/reindexing/index_selection_spec.rb b/spec/lib/gitlab/database/reindexing/index_selection_spec.rb
index 4466679a099..ee3f2b1b415 100644
--- a/spec/lib/gitlab/database/reindexing/index_selection_spec.rb
+++ b/spec/lib/gitlab/database/reindexing/index_selection_spec.rb
@@ -10,20 +10,50 @@ RSpec.describe Gitlab::Database::Reindexing::IndexSelection do
   before do
     swapout_view_for_table(:postgres_index_bloat_estimates)
     swapout_view_for_table(:postgres_indexes)
+
+    create_list(:postgres_index, 10, ondisk_size_bytes: 10.gigabytes).each_with_index do |index, i|
+      create(:postgres_index_bloat_estimate, index: index, bloat_size_bytes: 2.gigabyte * (i + 1))
+    end
   end
 
   def execute(sql)
     ActiveRecord::Base.connection.execute(sql)
   end
 
-  it 'orders by highest bloat first' do
-    create_list(:postgres_index, 10).each_with_index do |index, i|
-      create(:postgres_index_bloat_estimate, index: index, bloat_size_bytes: 1.megabyte * i)
-    end
+  it 'orders by highest relative bloat first' do
+    expected = Gitlab::Database::PostgresIndex.all.sort_by(&:relative_bloat_level).reverse.map(&:name)
+
+    expect(subject.map(&:name)).to eq(expected)
+  end
+
+  it 'excludes indexes with a relative bloat level below 20%' do
+    excluded = create(
+      :postgres_index_bloat_estimate,
+      index: create(:postgres_index, ondisk_size_bytes: 10.gigabytes),
+      bloat_size_bytes: 1.9.gigabyte  # 19% relative index bloat
+    )
 
-    expected = Gitlab::Database::PostgresIndexBloatEstimate.order(bloat_size_bytes: :desc).map(&:index)
+    expect(subject).not_to include(excluded.index)
+  end
+
+  it 'excludes indexes smaller than 1 GB ondisk size' do
+    excluded = create(
+      :postgres_index_bloat_estimate,
+      index: create(:postgres_index, ondisk_size_bytes: 0.99.gigabytes),
+      bloat_size_bytes: 0.8.gigabyte
+    )
+
+    expect(subject).not_to include(excluded.index)
+  end
+
+  it 'excludes indexes larger than 100 GB ondisk size' do
+    excluded = create(
+      :postgres_index_bloat_estimate,
+      index: create(:postgres_index, ondisk_size_bytes: 101.gigabytes),
+      bloat_size_bytes: 25.gigabyte
+    )
 
-    expect(subject).to eq(expected)
+    expect(subject).not_to include(excluded.index)
   end
 
   context 'with time frozen' do
@@ -31,20 +61,17 @@ RSpec.describe Gitlab::Database::Reindexing::IndexSelection do
       freeze_time { example.run }
     end
 
-    it 'does not return indexes with reindex action in the last 7 days' do
-      not_recently_reindexed = create_list(:postgres_index, 2).each_with_index do |index, i|
-        create(:postgres_index_bloat_estimate, index: index, bloat_size_bytes: 1.megabyte * i)
-        create(:reindex_action, index: index, action_end: Time.zone.now - 7.days - 1.minute)
+    it 'does not return indexes with reindex action in the last 10 days' do
+      not_recently_reindexed = Gitlab::Database::PostgresIndex.all.each do |index|
+        create(:reindex_action, index: index, action_end: Time.zone.now - 10.days - 1.minute)
       end
 
-      create_list(:postgres_index, 2).each_with_index do |index, i|
-        create(:postgres_index_bloat_estimate, index: index, bloat_size_bytes: 1.megabyte * i)
+      create_list(:postgres_index, 10, ondisk_size_bytes: 10.gigabytes).each_with_index do |index, i|
+        create(:postgres_index_bloat_estimate, index: index, bloat_size_bytes: 2.gigabyte * (i + 1))
         create(:reindex_action, index: index, action_end: Time.zone.now)
       end
 
-      expected = Gitlab::Database::PostgresIndexBloatEstimate.where(identifier: not_recently_reindexed.map(&:identifier)).map(&:index).map(&:identifier).sort
-
-      expect(subject.map(&:identifier).sort).to eq(expected)
+      expect(subject.map(&:name).sort).to eq(not_recently_reindexed.map(&:name).sort)
     end
   end
 end