Add latest changes from gitlab-org/gitlab@master

5 files changed, 65 insertions, 39 deletions

diff --git a/lib/gitlab/background_migration/backfill_project_namespace_details.rb b/lib/gitlab/background_migration/backfill_project_namespace_details.rb
new file mode 100644
index 00000000000..62d459acea2
--- /dev/null
+++ b/lib/gitlab/background_migration/backfill_project_namespace_details.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+module Gitlab
+  module BackgroundMigration
+    # Backfill project namespace_details for a range of projects
+    class BackfillProjectNamespaceDetails < ::Gitlab::BackgroundMigration::BatchedMigrationJob
+      def perform
+        each_sub_batch(operation_name: :backfill_project_namespace_details) do |sub_batch|
+          upsert_project_namespace_details(sub_batch)
+        end
+      end
+
+      def upsert_project_namespace_details(relation)
+        connection.execute(
+          <<~SQL
+          INSERT INTO namespace_details (description, description_html, cached_markdown_version, created_at, updated_at, namespace_id)
+            SELECT projects.description, projects.description_html, projects.cached_markdown_version, now(), now(), projects.project_namespace_id
+            FROM projects
+            WHERE projects.id IN(#{relation.select(:id).to_sql})
+          ON CONFLICT (namespace_id) DO NOTHING;
+        SQL
+        )
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/database/gitlab_schemas.yml b/lib/gitlab/database/gitlab_schemas.yml
index c4a9cf8b80f..db563f109c4 100644
--- a/lib/gitlab/database/gitlab_schemas.yml
+++ b/lib/gitlab/database/gitlab_schemas.yml
@@ -363,6 +363,7 @@ operations_scopes: :gitlab_main
 operations_strategies: :gitlab_main
 operations_strategies_user_lists: :gitlab_main
 operations_user_lists: :gitlab_main
+p_ci_builds_metadata: :gitlab_ci
 packages_build_infos: :gitlab_main
 packages_cleanup_policies: :gitlab_main
 packages_composer_cache_files: :gitlab_main
diff --git a/lib/gitlab/database/migration_helpers.rb b/lib/gitlab/database/migration_helpers.rb
index df40e3b3868..7f53378e730 100644
--- a/lib/gitlab/database/migration_helpers.rb
+++ b/lib/gitlab/database/migration_helpers.rb
@@ -947,43 +947,6 @@ module Gitlab
         execute("DELETE FROM batched_background_migrations WHERE #{conditions}")
       end
 
-      def ensure_batched_background_migration_is_finished(job_class_name:, table_name:, column_name:, job_arguments:, finalize: true)
-        Gitlab::Database::QueryAnalyzers::RestrictAllowedSchemas.require_dml_mode!
-
-        Gitlab::Database::BackgroundMigration::BatchedMigration.reset_column_information
-        migration = Gitlab::Database::BackgroundMigration::BatchedMigration.find_for_configuration(
-          Gitlab::Database.gitlab_schemas_for_connection(connection),
-          job_class_name, table_name, column_name, job_arguments
-        )
-
-        configuration = {
-          job_class_name: job_class_name,
-          table_name: table_name,
-          column_name: column_name,
-          job_arguments: job_arguments
-        }
-
-        return Gitlab::AppLogger.warn "Could not find batched background migration for the given configuration: #{configuration}" if migration.nil?
-
-        return if migration.finished?
-
-        finalize_batched_background_migration(job_class_name: job_class_name, table_name: table_name, column_name: column_name, job_arguments: job_arguments) if finalize
-
-        unless migration.reload.finished? # rubocop:disable Cop/ActiveRecordAssociationReload
-          raise "Expected batched background migration for the given configuration to be marked as 'finished', " \
-            "but it is '#{migration.status_name}':" \
-            "\t#{configuration}" \
-            "\n\n" \
-            "Finalize it manually by running the following command in a `bash` or `sh` shell:" \
-            "\n\n" \
-            "\tsudo gitlab-rake gitlab:background_migrations:finalize[#{job_class_name},#{table_name},#{column_name},'#{job_arguments.to_json.gsub(',', '\,')}']" \
-            "\n\n" \
-            "For more information, check the documentation" \
-            "\n\n" \
-            "\thttps://docs.gitlab.com/ee/user/admin_area/monitoring/background_migrations.html#database-migrations-failing-because-of-batched-background-migration-not-finished"
-        end
-      end
-
       # Returns an Array containing the indexes for the given column
       def indexes_for(table, column)
         column = column.to_s
diff --git a/lib/gitlab/database/migrations/batched_background_migration_helpers.rb b/lib/gitlab/database/migrations/batched_background_migration_helpers.rb
index 363fd0598f9..e958ce2aba4 100644
--- a/lib/gitlab/database/migrations/batched_background_migration_helpers.rb
+++ b/lib/gitlab/database/migrations/batched_background_migration_helpers.rb
@@ -196,6 +196,43 @@ module Gitlab
             :gitlab_main
           end
         end
+
+        def ensure_batched_background_migration_is_finished(job_class_name:, table_name:, column_name:, job_arguments:, finalize: true)
+          Gitlab::Database::QueryAnalyzers::RestrictAllowedSchemas.require_dml_mode!
+
+          Gitlab::Database::BackgroundMigration::BatchedMigration.reset_column_information
+          migration = Gitlab::Database::BackgroundMigration::BatchedMigration.find_for_configuration(
+            Gitlab::Database.gitlab_schemas_for_connection(connection),
+            job_class_name, table_name, column_name, job_arguments
+          )
+
+          configuration = {
+            job_class_name: job_class_name,
+            table_name: table_name,
+            column_name: column_name,
+            job_arguments: job_arguments
+          }
+
+          return Gitlab::AppLogger.warn "Could not find batched background migration for the given configuration: #{configuration}" if migration.nil?
+
+          return if migration.finished?
+
+          finalize_batched_background_migration(job_class_name: job_class_name, table_name: table_name, column_name: column_name, job_arguments: job_arguments) if finalize
+
+          return if migration.reload.finished? # rubocop:disable Cop/ActiveRecordAssociationReload
+
+          raise "Expected batched background migration for the given configuration to be marked as 'finished', " \
+            "but it is '#{migration.status_name}':" \
+            "\t#{configuration}" \
+            "\n\n" \
+            "Finalize it manually by running the following command in a `bash` or `sh` shell:" \
+            "\n\n" \
+            "\tsudo gitlab-rake gitlab:background_migrations:finalize[#{job_class_name},#{table_name},#{column_name},'#{job_arguments.to_json.gsub(',', '\,')}']" \
+            "\n\n" \
+            "For more information, check the documentation" \
+            "\n\n" \
+            "\thttps://docs.gitlab.com/ee/user/admin_area/monitoring/background_migrations.html#database-migrations-failing-because-of-batched-background-migration-not-finished"
+        end
       end
     end
   end
diff --git a/lib/tasks/gitlab/tw/codeowners.rake b/lib/tasks/gitlab/tw/codeowners.rake
index fd9c7114979..7098c091ee4 100644
--- a/lib/tasks/gitlab/tw/codeowners.rake
+++ b/lib/tasks/gitlab/tw/codeowners.rake
@@ -51,7 +51,7 @@ namespace :tw do
       CodeOwnerRule.new('Application Performance', '@sselhorn'),
       CodeOwnerRule.new('Monitor', '@msedlakjakubowski'),
       CodeOwnerRule.new('Observability', 'msedlakjakubowski'),
-      CodeOwnerRule.new('Optimize', '@fneill'),
+      CodeOwnerRule.new('Optimize', '@lciutacu'),
       CodeOwnerRule.new('Package', '@claytoncornell'),
       CodeOwnerRule.new('Pipeline Authoring', '@marcel.amirault'),
       CodeOwnerRule.new('Pipeline Execution', '@marcel.amirault'),
@@ -76,7 +76,7 @@ namespace :tw do
       CodeOwnerRule.new('Threat Insights', '@claytoncornell'),
       CodeOwnerRule.new('Utilization', '@fneill'),
       CodeOwnerRule.new('Vulnerability Research', '@claytoncornell'),
-      CodeOwnerRule.new('Workspace', '@fneill')
+      CodeOwnerRule.new('Workspace', '@lciutacu')
     ].freeze
 
     Document = Struct.new(:group, :redirect) do