Merge branch 'revert-841f45b7' into 'master'

Revert "Fix Elastic::MigrationWorker current_migration"

See merge request gitlab-org/gitlab!70405

ee/app/workers/elastic/migration_worker.rb

@@ -87,9 +87,9 @@ module Elastic
     end
 
     def current_migration
-      uncompleted_migrations = Elastic::MigrationRecord.load_versions(completed: false)
+      completed_migrations = Elastic::MigrationRecord.load_versions(completed: true)
 
-      Elastic::DataMigrationService.migrations.find { |migration| uncompleted_migrations.include?(migration.version) }
+      Elastic::DataMigrationService.migrations.find { |migration| !completed_migrations.include?(migration.version) }
     end
 
     def pause_indexing!(migration)

ee/spec/workers/elastic/migration_worker_spec.rb

@@ -22,10 +22,7 @@ RSpec.describe Elastic::MigrationWorker, :elastic do
 
       before do
         stub_ee_application_setting(elasticsearch_indexing: true)
-      end
 
-      context 'an unexecuted migration present' do
-        before do
         allow(subject).to receive(:current_migration).and_return(migration)
       end
 
@@ -35,6 +32,18 @@ RSpec.describe Elastic::MigrationWorker, :elastic do
         expect { subject.perform }.to change { Gitlab::Elastic::Helper.default.migrations_index_exists? }.from(false).to(true)
       end
 
+      context 'no unexecuted migrations' do
+        before do
+          allow(subject).to receive(:current_migration).and_return(nil)
+        end
+
+        it 'skips execution' do
+          expect(subject).not_to receive(:execute_migration)
+
+          expect(subject.perform).to be_falsey
+        end
+      end
+
       context 'migration is halted' do
         using RSpec::Parameterized::TableSyntax
 
@@ -178,30 +187,5 @@ RSpec.describe Elastic::MigrationWorker, :elastic do
         end
       end
     end
-
-      context 'no unexecuted migrations' do
-        before do
-          allow(subject).to receive(:current_migration).and_return(nil)
-        end
-
-        it 'skips execution' do
-          expect(subject).not_to receive(:execute_migration)
-
-          expect(subject.perform).to be_falsey
-        end
-      end
-
-      context 'load_versions returns empty array' do
-        before do
-          allow(Elastic::MigrationRecord).to receive(:load_versions).and_return([])
-        end
-
-        it 'skips execution' do
-          expect(subject).not_to receive(:execute_migration)
-
-          expect(subject.perform).to be_falsey
-        end
-      end
-    end
   end
 end