Add latest changes from gitlab-org/gitlab@master

6 files changed, 6 insertions, 55 deletions

diff --git a/db/post_migrate/20210907211557_finalize_ci_builds_bigint_conversion.rb b/db/post_migrate/20210907211557_finalize_ci_builds_bigint_conversion.rb
index 7544842c196..f164cdbf379 100644
--- a/db/post_migrate/20210907211557_finalize_ci_builds_bigint_conversion.rb
+++ b/db/post_migrate/20210907211557_finalize_ci_builds_bigint_conversion.rb
@@ -200,8 +200,7 @@ class FinalizeCiBuildsBigintConversion < Gitlab::Database::Migration[1.0]
         column: column,
         target_column: :id_convert_to_bigint,
         name: temporary_name,
-        on_delete: on_delete,
-        reverse_lock_order: true)
+        on_delete: on_delete)
     end
   end
 
@@ -214,9 +213,6 @@ class FinalizeCiBuildsBigintConversion < Gitlab::Database::Migration[1.0]
       next unless foreign_key_exists?(from_table, TABLE_NAME, column: column, primary_key: :id, name: existing_name)
 
       with_lock_retries do
-        # Explicitly lock table in order of parent, child to attempt to avoid deadlocks
-        execute "LOCK TABLE #{TABLE_NAME}, #{from_table} IN ACCESS EXCLUSIVE MODE"
-
         temporary_name = "#{existing_name}_tmp"
 
         remove_foreign_key(from_table, TABLE_NAME, column: column, primary_key: :id, name: existing_name)
diff --git a/db/post_migrate/20211007155221_schedule_populate_status_column_of_security_scans.rb b/db/post_migrate/20211007155221_schedule_populate_status_column_of_security_scans.rb
index 03032dfbb0a..04af23446fd 100644
--- a/db/post_migrate/20211007155221_schedule_populate_status_column_of_security_scans.rb
+++ b/db/post_migrate/20211007155221_schedule_populate_status_column_of_security_scans.rb
@@ -1,21 +1,8 @@
 # frozen_string_literal: true
 
 class SchedulePopulateStatusColumnOfSecurityScans < Gitlab::Database::Migration[1.0]
-  MIGRATION = 'PopulateStatusColumnOfSecurityScans'
-  BATCH_SIZE = 10_000
-  DELAY_INTERVAL = 2.minutes
-
-  disable_ddl_transaction!
-
   def up
-    return unless Gitlab.ee?
-
-    queue_background_migration_jobs_by_range_at_intervals(
-      define_batchable_model('security_scans'),
-      MIGRATION,
-      DELAY_INTERVAL,
-      batch_size: BATCH_SIZE
-    )
+    # no-op
   end
 
   def down
diff --git a/db/post_migrate/20211208122200_schedule_backfill_ci_namespace_mirrors.rb b/db/post_migrate/20211208122200_schedule_backfill_ci_namespace_mirrors.rb
index 3d39148f402..e42b74748d7 100644
--- a/db/post_migrate/20211208122200_schedule_backfill_ci_namespace_mirrors.rb
+++ b/db/post_migrate/20211208122200_schedule_backfill_ci_namespace_mirrors.rb
@@ -1,20 +1,8 @@
 # frozen_string_literal: true
 
 class ScheduleBackfillCiNamespaceMirrors < Gitlab::Database::Migration[1.0]
-  MIGRATION = 'BackfillCiNamespaceMirrors'
-  BATCH_SIZE = 10_000
-  DELAY_INTERVAL = 2.minutes
-
-  disable_ddl_transaction!
-
   def up
-    queue_background_migration_jobs_by_range_at_intervals(
-      Gitlab::BackgroundMigration::BackfillCiNamespaceMirrors::Namespace.base_query,
-      MIGRATION,
-      DELAY_INTERVAL,
-      batch_size: BATCH_SIZE,
-      track_jobs: true
-    )
+    # no-op
   end
 
   def down
diff --git a/db/post_migrate/20211208122201_schedule_backfill_ci_project_mirrors.rb b/db/post_migrate/20211208122201_schedule_backfill_ci_project_mirrors.rb
index 5678ee9f292..2a58eda040e 100644
--- a/db/post_migrate/20211208122201_schedule_backfill_ci_project_mirrors.rb
+++ b/db/post_migrate/20211208122201_schedule_backfill_ci_project_mirrors.rb
@@ -1,20 +1,8 @@
 # frozen_string_literal: true
 
 class ScheduleBackfillCiProjectMirrors < Gitlab::Database::Migration[1.0]
-  MIGRATION = 'BackfillCiProjectMirrors'
-  BATCH_SIZE = 10_000
-  DELAY_INTERVAL = 2.minutes
-
-  disable_ddl_transaction!
-
   def up
-    queue_background_migration_jobs_by_range_at_intervals(
-      Gitlab::BackgroundMigration::BackfillCiProjectMirrors::Project.base_query,
-      MIGRATION,
-      DELAY_INTERVAL,
-      batch_size: BATCH_SIZE,
-      track_jobs: true
-    )
+    # no-op
   end
 
   def down
diff --git a/db/post_migrate/20220127132200_cleanup_backfill_ci_namespace_mirrors.rb b/db/post_migrate/20220127132200_cleanup_backfill_ci_namespace_mirrors.rb
index 65ec2f9a282..a6775251d42 100644
--- a/db/post_migrate/20220127132200_cleanup_backfill_ci_namespace_mirrors.rb
+++ b/db/post_migrate/20220127132200_cleanup_backfill_ci_namespace_mirrors.rb
@@ -1,12 +1,8 @@
 # frozen_string_literal: true
 
 class CleanupBackfillCiNamespaceMirrors < Gitlab::Database::Migration[1.0]
-  MIGRATION = 'BackfillCiNamespaceMirrors'
-
-  disable_ddl_transaction!
-
   def up
-    finalize_background_migration(MIGRATION)
+    # no-op
   end
 
   def down
diff --git a/db/post_migrate/20220127132201_cleanup_backfill_ci_project_mirrors.rb b/db/post_migrate/20220127132201_cleanup_backfill_ci_project_mirrors.rb
index 8c7d9a945ba..c0cdb74c595 100644
--- a/db/post_migrate/20220127132201_cleanup_backfill_ci_project_mirrors.rb
+++ b/db/post_migrate/20220127132201_cleanup_backfill_ci_project_mirrors.rb
@@ -1,12 +1,8 @@
 # frozen_string_literal: true
 
 class CleanupBackfillCiProjectMirrors < Gitlab::Database::Migration[1.0]
-  MIGRATION = 'BackfillCiProjectMirrors'
-
-  disable_ddl_transaction!
-
   def up
-    finalize_background_migration(MIGRATION)
+    # no-op
   end
 
   def down