Merge branch '338867-ignore-ci-build-deployment-2pc-offenses' into 'master'

Ignore Ci::Build 2PC offenses with Deployment

See merge request gitlab-org/gitlab!68533

app/models/ci/build.rb

@@ -306,7 +306,9 @@ module Ci
       end
 
       after_transition pending: :running do |build|
-        build.deployment&.run
+        Gitlab::Database.allow_cross_database_modification_within_transaction(url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/338867') do
+          build.deployment&.run
+        end
 
         build.run_after_commit do
           build.pipeline.persistent_ref.create
@@ -328,7 +330,9 @@ module Ci
       end
 
       after_transition any => [:success] do |build|
-        build.deployment&.succeed
+        Gitlab::Database.allow_cross_database_modification_within_transaction(url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/338867') do
+          build.deployment&.succeed
+        end
 
         build.run_after_commit do
           BuildSuccessWorker.perform_async(id)
@@ -341,7 +345,9 @@ module Ci
         next unless build.deployment
 
         begin
-          build.deployment.drop!
+          Gitlab::Database.allow_cross_database_modification_within_transaction(url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/338867') do
+            build.deployment.drop!
+          end
         rescue StandardError => e
           Gitlab::ErrorTracking.track_and_raise_for_dev_exception(e, build_id: build.id)
         end
@@ -362,10 +368,12 @@ module Ci
       end
 
       after_transition any => [:skipped, :canceled] do |build, transition|
-        if transition.to_name == :skipped
-          build.deployment&.skip
-        else
-          build.deployment&.cancel
+        Gitlab::Database.allow_cross_database_modification_within_transaction(url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/338867') do
+          if transition.to_name == :skipped
+            build.deployment&.skip
+          else
+            build.deployment&.cancel
+          end
         end
       end
     end

lib/gitlab/database.rb

@@ -147,9 +147,16 @@ module Gitlab
       # spec/support/database/prevent_cross_joins.rb
     end
 
+    # This method will allow cross database modifications within the block
+    # Example:
+    #
+    # allow_cross_database_modification_within_transaction(url: 'url-to-an-issue') do
+    #   create(:build) # inserts ci_build and project record in one transaction
+    # end
     def self.allow_cross_database_modification_within_transaction(url:)
-      # this method is implemented in:
+      # this method will be overridden in:
       # spec/support/database/cross_database_modification_check.rb
+      yield
     end
 
     def self.add_post_migrate_path_to_rails(force: false)

spec/models/ci/build_spec.rb

@@ -1307,7 +1307,9 @@ RSpec.describe Ci::Build do
 
     shared_examples_for 'avoid deadlock' do
       it 'executes UPDATE in the right order' do
-        recorded = ActiveRecord::QueryRecorder.new { subject }
+        recorded = with_cross_database_modification_prevented do
+          ActiveRecord::QueryRecorder.new { subject }
+        end
 
         index_for_build = recorded.log.index { |l| l.include?("UPDATE \"ci_builds\"") }
         index_for_deployment = recorded.log.index { |l| l.include?("UPDATE \"deployments\"") }
@@ -1322,7 +1324,9 @@ RSpec.describe Ci::Build do
       it_behaves_like 'avoid deadlock'
 
       it 'transits deployment status to running' do
-        subject
+        with_cross_database_modification_prevented do
+          subject
+        end
 
         expect(deployment).to be_running
       end
@@ -1340,7 +1344,9 @@ RSpec.describe Ci::Build do
       it_behaves_like 'calling proper BuildFinishedWorker'
 
       it 'transits deployment status to success' do
-        subject
+        with_cross_database_modification_prevented do
+          subject
+        end
 
         expect(deployment).to be_success
       end
@@ -1353,7 +1359,9 @@ RSpec.describe Ci::Build do
       it_behaves_like 'calling proper BuildFinishedWorker'
 
       it 'transits deployment status to failed' do
-        subject
+        with_cross_database_modification_prevented do
+          subject
+        end
 
         expect(deployment).to be_failed
       end
@@ -1365,7 +1373,9 @@ RSpec.describe Ci::Build do
       it_behaves_like 'avoid deadlock'
 
       it 'transits deployment status to skipped' do
-        subject
+        with_cross_database_modification_prevented do
+          subject
+        end
 
         expect(deployment).to be_skipped
       end
@@ -1378,7 +1388,9 @@ RSpec.describe Ci::Build do
       it_behaves_like 'calling proper BuildFinishedWorker'
 
       it 'transits deployment status to canceled' do
-        subject
+        with_cross_database_modification_prevented do
+          subject
+        end
 
         expect(deployment).to be_canceled
       end