diff --git a/.rubocop_todo/rails/find_each.yml b/.rubocop_todo/rails/find_each.yml
index 824b7d01c505908c708f4fd755ba6fd0b567492d..81fd6a7bcb7178aebe60bd554383c17e21d85fb7 100644
--- a/.rubocop_todo/rails/find_each.yml
+++ b/.rubocop_todo/rails/find_each.yml
@@ -11,7 +11,6 @@ Rails/FindEach:
- 'db/post_migrate/20231003045342_migrate_sidekiq_namespaced_jobs.rb'
- 'ee/app/workers/compliance_management/merge_requests/compliance_violations_consistency_worker.rb'
- 'ee/lib/ee/gitlab/background_migration/create_compliance_standards_adherence.rb'
- - 'ee/spec/elastic/migrate/20230901120542_force_reindex_commits_from_main_index_spec.rb'
- 'ee/spec/elastic/migrate/20231004124852_reindex_and_remove_leftover_notes_from_main_index_spec.rb'
- 'ee/spec/elastic/migrate/20231005103449_reindex_and_remove_leftover_merge_request_in_main_index_spec.rb'
- 'ee/spec/frontend/fixtures/runner.rb'
diff --git a/.rubocop_todo/style/inline_disable_annotation.yml b/.rubocop_todo/style/inline_disable_annotation.yml
index 9081f0625d876137db67022a9334e8daefa0d0ec..bbca792b99a7411d2fa32a95be232cf9a96f30e2 100644
--- a/.rubocop_todo/style/inline_disable_annotation.yml
+++ b/.rubocop_todo/style/inline_disable_annotation.yml
@@ -1642,7 +1642,6 @@ Style/InlineDisableAnnotation:
- 'ee/elastic/migrate/20230724070100_backfill_epics.rb'
- 'ee/elastic/migrate/20230724151612_backfill_archived_field_in_commits.rb'
- 'ee/elastic/migrate/20230821123542_backfill_archived_field_in_blob.rb'
- - 'ee/elastic/migrate/20230901120542_force_reindex_commits_from_main_index.rb'
- 'ee/elastic/migrate/20231019223356_reindex_wikis_to_fix_routing_and_backfill_archived.rb'
- 'ee/lib/analytics/devops_adoption/snapshot_calculator.rb'
- 'ee/lib/analytics/group_activity_calculator.rb'
diff --git a/ee/elastic/docs/20230901120542_force_reindex_commits_from_main_index.yml b/ee/elastic/docs/20230901120542_force_reindex_commits_from_main_index.yml
index e319b56e2320d0bf779f9eb28856ae9c58e6db3c..ed5ed6e7e1ed12c45842c5560824ad19a442309f 100644
--- a/ee/elastic/docs/20230901120542_force_reindex_commits_from_main_index.yml
+++ b/ee/elastic/docs/20230901120542_force_reindex_commits_from_main_index.yml
@@ -6,6 +6,6 @@ description: This will force reindex commits for all the projects from the main
group: group::global search
milestone: '16.4'
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/130718
-obsolete: false
-marked_obsolete_by_url:
-marked_obsolete_in_milestone:
+obsolete: true
+marked_obsolete_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/159916
+marked_obsolete_in_milestone: '17.3'
diff --git a/ee/elastic/migrate/20230901120542_force_reindex_commits_from_main_index.rb b/ee/elastic/migrate/20230901120542_force_reindex_commits_from_main_index.rb
index 038293bbba62d3e1702fc45c51952693a59656e9..f0dd29574d873e3fed6df90e8322ea76dcb4ee92 100644
--- a/ee/elastic/migrate/20230901120542_force_reindex_commits_from_main_index.rb
+++ b/ee/elastic/migrate/20230901120542_force_reindex_commits_from_main_index.rb
@@ -37,7 +37,7 @@ def batch_of_rids_to_reindex
size: 0, query: query, aggs: { rids: { terms: { size: batch_size, field: 'commit.rid' } } }
})
rids_hist = results.dig('aggregations', 'rids', 'buckets') || []
- rids_hist.pluck('key') # rubocop: disable CodeReuse/ActiveRecord
+ rids_hist.pluck('key') # rubocop: disable CodeReuse/ActiveRecord -- ActiveRecord is not used
end
def update_schema_version(rid)
@@ -62,3 +62,5 @@ def index_name
Elastic::Latest::Config.index_name
end
end
+
+ForceReindexCommitsFromMainIndex.prepend ::Elastic::MigrationObsolete
diff --git a/ee/spec/elastic/migrate/20230901120542_force_reindex_commits_from_main_index_spec.rb b/ee/spec/elastic/migrate/20230901120542_force_reindex_commits_from_main_index_spec.rb
index ecd38570d1ff76603bc011f7067a28ed445bec69..5031d80a043204596a7b6050f11ed16da6034d1d 100644
--- a/ee/spec/elastic/migrate/20230901120542_force_reindex_commits_from_main_index_spec.rb
+++ b/ee/spec/elastic/migrate/20230901120542_force_reindex_commits_from_main_index_spec.rb
@@ -3,145 +3,6 @@
require 'spec_helper'
require File.expand_path('ee/elastic/migrate/20230901120542_force_reindex_commits_from_main_index.rb')
-RSpec.describe ForceReindexCommitsFromMainIndex, :elastic_delete_by_query, :sidekiq_inline, feature_category: :global_search do
- let(:version) { 20230901120542 }
- let(:migration) { described_class.new(version) }
- let(:helper) { Gitlab::Elastic::Helper.new }
- let(:client) { ::Gitlab::Search::Client.new }
- let_it_be_with_reload(:projects) { create_list(:project, 3, :repository) }
-
- before do
- stub_ee_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
- allow(migration).to receive(:helper).and_return(helper)
- allow(migration).to receive(:client).and_return(client)
- end
-
- describe 'migration_options' do
- it 'has migration options set', :aggregate_failures do
- expect(migration).to be_batched
- expect(migration.batch_size).to eq 200
- expect(migration.throttle_delay).to eq(3.minutes)
- expect(migration).to be_retry_on_failure
- end
- end
-
- describe '.completed?' do
- before do
- Project.all.each { |p| populate_commits_in_main_index!(p) }
- end
-
- context 'when no commits documents are in the main index' do
- before do
- client.delete_by_query(index: helper.target_name, conflicts: 'proceed', refresh: true,
- body: { query: { bool: { filter: { term: { type: 'commit' } } } } }
- )
- end
-
- it 'returns true' do
- expect(migration).to be_completed
- end
- end
-
- context 'when commits documents exists in the main index' do
- context 'and schema_version is set for all documents' do
- before do
- Project.all.each { |p| set_schema_version(p) }
- end
-
- it 'returns true' do
- expect(migration).to be_completed
- end
- end
-
- context 'and schema_version is not set for some documents' do
- before do
- set_schema_version(Project.first)
- end
-
- it 'returns false' do
- expect(migration).not_to be_completed
- end
- end
- end
- end
-
- describe '.migrate' do
- let(:batch_size) { 1 }
-
- before do
- allow(migration).to receive(:batch_size).and_return(batch_size)
- Project.all.each { |p| populate_commits_in_main_index!(p) }
- end
-
- context 'if migration is completed' do
- before do
- Project.all.each { |p| set_schema_version(p) }
- end
-
- it 'performs logging and does not call ElasticCommitIndexerWorker' do
- expect(migration).to receive(:log).with("Setting migration_state to #{{ documents_remaining: 0 }.to_json}").once
- expect(migration).to receive(:log).with('Checking if migration is finished', { total_remaining: 0 }).once
- expect(migration).to receive(:log).with('Migration Completed', { total_remaining: 0 }).once
- expect(ElasticCommitIndexerWorker).not_to receive(:perform_in)
- migration.migrate
- end
- end
-
- context 'if migration is not completed' do
- it 'calls ElasticCommitIndexerWorker and performs force indexing' do
- delay = a_value_between(0, migration.throttle_delay.seconds.to_i)
- initial_documents_left_to_be_indexed_count = documents_left_to_be_indexed_count
- expect(initial_documents_left_to_be_indexed_count).to be > 0 # Ensure that the migration is not already finished
- expect(ElasticCommitIndexerWorker).to receive(:perform_in).with(delay, anything, false, force: true)
- expect(migration).not_to be_completed
- migration.migrate
- expect(initial_documents_left_to_be_indexed_count - documents_left_to_be_indexed_count).to eq batch_size
- expect(migration).not_to be_completed
- expect(ElasticCommitIndexerWorker).to receive(:perform_in).with(delay, anything, false, force: true).twice
- 10.times do
- break if migration.completed?
-
- migration.migrate
- end
- expect(indexed_documents_count).to eq Project.count
- expect(migration).to be_completed
- end
- end
- end
-
- def populate_commits_in_main_index!(project)
- client.index(index: helper.target_name, routing: "project_#{project.id}", refresh: true,
- body: { commit: { type: 'commit',
- author: { name: 'F L', email: 't@t.com', time: Time.now.strftime('%Y%m%dT%H%M%S+0000') },
- committer: { name: 'F L', email: 't@t.com', time: Time.now.strftime('%Y%m%dT%H%M%S+0000') },
- rid: project.id, message: 'test' },
- join_field: { name: 'commit', parent: "project_#{project.id}" },
- repository_access_level: project.repository_access_level, type: 'commit',
- visibility_level: project.visibility_level })
- end
-
- def set_schema_version(project)
- query = { bool: { filter: [{ term: { type: 'commit' } }, { term: { 'commit.rid' => project.id.to_s } }],
- must_not: { exists: { field: 'schema_version' } } } }
- script = { source: "ctx._source.schema_version = #{described_class::SCHEMA_VERSION}" }
- client.update_by_query(index: helper.target_name, routing: "project_#{project.id}", conflicts: 'proceed',
- body: { query: query, script: script }, refresh: true
- )
- end
-
- def indexed_documents_count
- query = { bool: { filter: [{ term: { type: 'commit' } },
- { term: { schema_version: described_class::SCHEMA_VERSION } }] } }
- get_documents_count(query)
- end
-
- def documents_left_to_be_indexed_count
- query = { bool: { filter: { term: { type: 'commit' } }, must_not: { exists: { field: 'schema_version' } } } }
- get_documents_count(query)
- end
-
- def get_documents_count(query)
- refresh_index!
- client.count(index: helper.target_name, body: { query: query })['count']
- end
+RSpec.describe ForceReindexCommitsFromMainIndex, feature_category: :global_search do
+ it_behaves_like 'a deprecated Advanced Search migration', 20230901120542
end