Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42

5 files changed, 69 insertions, 1 deletions

diff --git a/app/workers/database/batched_background_migration/ci_database_worker.rb b/app/workers/database/batched_background_migration/ci_database_worker.rb
index 98ec6f98123..13314cf95e2 100644
--- a/app/workers/database/batched_background_migration/ci_database_worker.rb
+++ b/app/workers/database/batched_background_migration/ci_database_worker.rb
@@ -4,6 +4,10 @@ module Database
     class CiDatabaseWorker # rubocop:disable Scalability/IdempotentWorker
       include SingleDatabaseWorker
 
+      def self.enabled?
+        Feature.enabled?(:execute_batched_migrations_on_schedule_ci_database, type: :ops, default_enabled: :yaml)
+      end
+
       def self.tracking_database
         @tracking_database ||= Gitlab::Database::CI_DATABASE_NAME
       end
diff --git a/app/workers/database/batched_background_migration/single_database_worker.rb b/app/workers/database/batched_background_migration/single_database_worker.rb
index 78c82a6549f..aeadda4b8e1 100644
--- a/app/workers/database/batched_background_migration/single_database_worker.rb
+++ b/app/workers/database/batched_background_migration/single_database_worker.rb
@@ -23,6 +23,10 @@ module Database
         def tracking_database
           raise NotImplementedError, "#{self.name} does not implement #{__method__}"
         end
+
+        def enabled?
+          raise NotImplementedError, "#{self.name} does not implement #{__method__}"
+        end
         # :nocov:
 
         def lease_key
@@ -41,7 +45,7 @@ module Database
         end
 
         Gitlab::Database::SharedModel.using_connection(base_model.connection) do
-          break unless Feature.enabled?(:execute_batched_migrations_on_schedule, type: :ops, default_enabled: :yaml) && active_migration
+          break unless self.class.enabled? && active_migration
 
           with_exclusive_lease(active_migration.interval) do
             # Now that we have the exclusive lease, reload migration in case another process has changed it.
diff --git a/app/workers/database/batched_background_migration_worker.rb b/app/workers/database/batched_background_migration_worker.rb
index 29804be832d..6a41fe70915 100644
--- a/app/workers/database/batched_background_migration_worker.rb
+++ b/app/workers/database/batched_background_migration_worker.rb
@@ -4,6 +4,10 @@ module Database
   class BatchedBackgroundMigrationWorker # rubocop:disable Scalability/IdempotentWorker
     include BatchedBackgroundMigration::SingleDatabaseWorker
 
+    def self.enabled?
+      Feature.enabled?(:execute_batched_migrations_on_schedule, type: :ops, default_enabled: :yaml)
+    end
+
     def self.tracking_database
       @tracking_database ||= Gitlab::Database::MAIN_DATABASE_NAME.to_sym
     end
diff --git a/app/workers/database/ci_namespace_mirrors_consistency_check_worker.rb b/app/workers/database/ci_namespace_mirrors_consistency_check_worker.rb
new file mode 100644
index 00000000000..2b4253947ac
--- /dev/null
+++ b/app/workers/database/ci_namespace_mirrors_consistency_check_worker.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Database
+  class CiNamespaceMirrorsConsistencyCheckWorker
+    include ApplicationWorker
+    include CronjobQueue # rubocop: disable Scalability/CronWorkerContext
+
+    sidekiq_options retry: false
+    feature_category :sharding
+    data_consistency :sticky
+    idempotent!
+
+    version 1
+
+    def perform
+      return if Feature.disabled?(:ci_namespace_mirrors_consistency_check, default_enabled: :yaml)
+
+      results = ConsistencyCheckService.new(
+        source_model: Namespace,
+        target_model: Ci::NamespaceMirror,
+        source_columns: %w[id traversal_ids],
+        target_columns: %w[namespace_id traversal_ids]
+      ).execute
+
+      log_extra_metadata_on_done(:results, results)
+    end
+  end
+end
diff --git a/app/workers/database/ci_project_mirrors_consistency_check_worker.rb b/app/workers/database/ci_project_mirrors_consistency_check_worker.rb
new file mode 100644
index 00000000000..e9413256617
--- /dev/null
+++ b/app/workers/database/ci_project_mirrors_consistency_check_worker.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Database
+  class CiProjectMirrorsConsistencyCheckWorker
+    include ApplicationWorker
+    include CronjobQueue # rubocop: disable Scalability/CronWorkerContext
+
+    sidekiq_options retry: false
+    feature_category :sharding
+    data_consistency :sticky
+    idempotent!
+
+    version 1
+
+    def perform
+      return if Feature.disabled?(:ci_project_mirrors_consistency_check, default_enabled: :yaml)
+
+      results = ConsistencyCheckService.new(
+        source_model: Project,
+        target_model: Ci::ProjectMirror,
+        source_columns: %w[id namespace_id],
+        target_columns: %w[project_id namespace_id]
+      ).execute
+
+      log_extra_metadata_on_done(:results, results)
+    end
+  end
+end