Add latest changes from gitlab-org/gitlab@15-2-stable-eev15.2.0-rc42

2 files changed, 16 insertions, 37 deletions

diff --git a/spec/support/shared_examples/workers/batched_background_migration_worker_shared_examples.rb b/spec/support/shared_examples/workers/batched_background_migration_worker_shared_examples.rb
index 54962eac100..1da21633504 100644
--- a/spec/support/shared_examples/workers/batched_background_migration_worker_shared_examples.rb
+++ b/spec/support/shared_examples/workers/batched_background_migration_worker_shared_examples.rb
@@ -229,6 +229,7 @@ RSpec.shared_examples 'it runs batched background migration jobs' do |tracking_d
 
   describe 'executing an entire migration', :freeze_time, if: Gitlab::Database.has_config?(tracking_database) do
     include Gitlab::Database::DynamicModelHelpers
+    include Database::DatabaseHelpers
 
     let(:migration_class) do
       Class.new(Gitlab::BackgroundMigration::BatchedMigrationJob) do
@@ -347,5 +348,20 @@ RSpec.shared_examples 'it runs batched background migration jobs' do |tracking_d
     it 'does not update non-matching records in the range' do
       expect { full_migration_run }.not_to change { example_data.where('status <> 1 AND some_column <> 0').count }
     end
+
+    context 'health status' do
+      subject(:migration_run) { described_class.new.perform }
+
+      it 'puts migration on hold when there is autovaccum activity on related tables' do
+        swapout_view_for_table(:postgres_autovacuum_activity, connection: connection)
+        create(
+          :postgres_autovacuum_activity,
+          table: migration.table_name,
+          table_identifier: "public.#{migration.table_name}"
+        )
+
+        expect { migration_run }.to change { migration.reload.on_hold? }.from(false).to(true)
+      end
+    end
   end
 end
diff --git a/spec/support/shared_examples/workers/concerns/git_garbage_collect_methods_shared_examples.rb b/spec/support/shared_examples/workers/concerns/git_garbage_collect_methods_shared_examples.rb
index 77c4a3431e2..503e331ea2e 100644
--- a/spec/support/shared_examples/workers/concerns/git_garbage_collect_methods_shared_examples.rb
+++ b/spec/support/shared_examples/workers/concerns/git_garbage_collect_methods_shared_examples.rb
@@ -1,10 +1,6 @@
 # frozen_string_literal: true
 
-require 'fileutils'
-
 RSpec.shared_examples 'can collect git garbage' do |update_statistics: true|
-  include GitHelpers
-
   let!(:lease_uuid) { SecureRandom.uuid }
   let!(:lease_key) { "resource_housekeeping:#{resource.id}" }
   let(:params) { [resource.id, task, lease_key, lease_uuid] }
@@ -246,39 +242,6 @@ RSpec.shared_examples 'can collect git garbage' do |update_statistics: true|
 
         subject.perform(resource.id, 'prune', lease_key, lease_uuid)
       end
-
-      # Create a new commit on a random new branch
-      def create_objects(resource)
-        rugged = rugged_repo(resource.repository)
-        old_commit = rugged.branches.first.target
-        new_commit_sha = Rugged::Commit.create(
-          rugged,
-          message: "hello world #{SecureRandom.hex(6)}",
-          author: { email: 'foo@bar', name: 'baz' },
-          committer: { email: 'foo@bar', name: 'baz' },
-          tree: old_commit.tree,
-          parents: [old_commit]
-        )
-        rugged.references.create("refs/heads/#{SecureRandom.hex(6)}", new_commit_sha)
-      end
-
-      def packs(resource)
-        Dir["#{path_to_repo}/objects/pack/*.pack"]
-      end
-
-      def packed_refs(resource)
-        path = File.join(path_to_repo, 'packed-refs')
-        FileUtils.touch(path)
-        File.read(path)
-      end
-
-      def path_to_repo
-        @path_to_repo ||= File.join(TestEnv.repos_path, resource.repository.relative_path)
-      end
-
-      def bitmap_path(pack)
-        pack.sub(/\.pack\z/, '.bitmap')
-      end
     end
 
     context 'with bitmaps enabled' do