Merge branch 'remove-ci-optimize-project-records-destruction-ff' into 'master'

[feature flag] Removes all ci_optimize_project_records_destruction

See merge request gitlab-org/gitlab!72600

app/services/projects/destroy_service.rb

@@ -130,10 +130,7 @@ module Projects
       destroy_events!
       destroy_web_hooks!
       destroy_project_bots!
-
-      if ::Feature.enabled?(:ci_optimize_project_records_destruction, project, default_enabled: :yaml)
-        destroy_ci_records!
-      end
+      destroy_ci_records!
 
       # Rails attempts to load all related records into memory before
       # destroying: https://github.com/rails/rails/issues/22510

config/feature_flags/development/ci_optimize_project_records_destruction.yml

----
-name: ci_optimize_project_records_destruction
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71342
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/341936
-milestone: '14.4'
-type: development
-group: group::pipeline execution
-default_enabled: false

spec/services/projects/destroy_service_spec.rb

@@ -55,32 +55,16 @@ RSpec.describe Projects::DestroyService, :aggregate_failures do
           .and change { Ci::Pipeline.count }.by(-1)
       end
 
-      context 'with ci_optimize_project_records_destruction disabled' do
-        stub_feature_flags(ci_optimize_project_records_destruction: false)
+      it 'avoids N+1 queries' do
+        recorder = ActiveRecord::QueryRecorder.new { destroy_project(project, user, {}) }
 
-        it 'avoids N+1 queries' do
-          recorder = ActiveRecord::QueryRecorder.new { destroy_project(project, user, {}) }
+        project = create(:project, :repository, namespace: user.namespace)
+        pipeline = create(:ci_pipeline, project: project)
+        builds = create_list(:ci_build, 3, :artifacts, pipeline: pipeline)
+        create(:ci_pipeline_artifact, pipeline: pipeline)
+        create_list(:ci_build_trace_chunk, 3, build: builds[0])
 
-          project = create(:project, :repository, namespace: user.namespace)
-          pipeline = create(:ci_pipeline, project: project)
-          builds = create_list(:ci_build, 3, :artifacts, pipeline: pipeline)
-          create_list(:ci_build_trace_chunk, 3, build: builds[0])
-
-          expect { destroy_project(project, project.owner, {}) }.not_to exceed_query_limit(recorder)
-        end
-      end
-
-      context 'with ci_optimize_project_records_destruction enabled' do
-        it 'avoids N+1 queries' do
-          recorder = ActiveRecord::QueryRecorder.new { destroy_project(project, user, {}) }
-
-          project = create(:project, :repository, namespace: user.namespace)
-          pipeline = create(:ci_pipeline, project: project)
-          builds = create_list(:ci_build, 3, :artifacts, pipeline: pipeline)
-          create_list(:ci_build_trace_chunk, 3, build: builds[0])
-
-          expect { destroy_project(project, project.owner, {}) }.not_to exceed_query_limit(recorder)
-        end
+        expect { destroy_project(project, project.owner, {}) }.not_to exceed_query_limit(recorder)
       end
 
       it_behaves_like 'deleting the project'
@@ -116,11 +100,11 @@ RSpec.describe Projects::DestroyService, :aggregate_failures do
     destroy_project(project, user, {})
   end
 
-  context 'with running pipelines to be aborted' do
+  context 'with running pipelines' do
     let!(:pipelines)               { create_list(:ci_pipeline, 3, :running, project: project) }
     let(:destroy_pipeline_service) { double('DestroyPipelineService', execute: nil) }
 
-    it 'executes DestroyPipelineService for project ci pipelines' do
+    it 'bulks-fails with AbortPipelineService and then executes DestroyPipelineService for each pipelines' do
       allow(::Ci::DestroyPipelineService).to receive(:new).and_return(destroy_pipeline_service)
 
       expect(::Ci::AbortPipelinesService)
@@ -128,33 +112,11 @@ RSpec.describe Projects::DestroyService, :aggregate_failures do
         .with(project.all_pipelines, :project_deleted)
 
       pipelines.each do |pipeline|
-        expect(destroy_pipeline_service)
-          .to receive(:execute)
-          .with(pipeline)
+        expect(destroy_pipeline_service).to receive(:execute).with(pipeline)
       end
 
       destroy_project(project, user, {})
     end
-
-    context 'with ci_optimize_project_records_destruction disabled' do
-      before do
-        stub_feature_flags(ci_optimize_project_records_destruction: false)
-      end
-
-      it 'bulk-fails project ci pipelines' do
-        expect(::Ci::AbortPipelinesService)
-          .to receive_message_chain(:new, :execute)
-          .with(project.all_pipelines, :project_deleted)
-
-        destroy_project(project, user, {})
-      end
-
-      it 'does not destroy CI records via DestroyPipelineService' do
-        expect(::Ci::DestroyPipelineService).not_to receive(:new)
-
-        destroy_project(project, user, {})
-      end
-    end
   end
 
   context 'when project has remote mirrors' do