Add latest changes from gitlab-org/gitlab@master

7 files changed, 67 insertions, 3 deletions

diff --git a/db/docs/merge_trains.yml b/db/docs/merge_trains.yml
index 3b666322d3b..7d0310236e9 100644
--- a/db/docs/merge_trains.yml
+++ b/db/docs/merge_trains.yml
@@ -1,10 +1,10 @@
 ---
 table_name: merge_trains
 classes:
-- MergeTrain
+- MergeTrains::Car
 feature_categories:
 - continuous_integration
-description: TODO
+description: Each record represents a single merge request which is or was part of a merge train.
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/827fc3ccb9335aa29fba0fc532b70015ec4c5186
 milestone: '11.11'
 gitlab_schema: gitlab_main
diff --git a/db/docs/schema_inconsistencies.yml b/db/docs/schema_inconsistencies.yml
index 85a2681a523..af95f26accb 100644
--- a/db/docs/schema_inconsistencies.yml
+++ b/db/docs/schema_inconsistencies.yml
@@ -5,4 +5,6 @@ feature_categories:
 description: The schema_inconsistencies table contains a list of database schema inconsistencies.
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/114876
 milestone: '15.11'
+classes:
+- Gitlab::Database::SchemaValidation::SchemaInconsistency
 gitlab_schema: gitlab_main
diff --git a/db/post_migrate/20230329091107_truncate_p_ci_runner_machine_builds.rb b/db/post_migrate/20230329091107_truncate_p_ci_runner_machine_builds.rb
new file mode 100644
index 00000000000..b9efdd8234d
--- /dev/null
+++ b/db/post_migrate/20230329091107_truncate_p_ci_runner_machine_builds.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class TruncatePCiRunnerMachineBuilds < Gitlab::Database::Migration[2.1]
+  disable_ddl_transaction!
+
+  def up
+    return unless Gitlab::Database.gitlab_schemas_for_connection(connection).include?(:gitlab_ci)
+
+    execute('TRUNCATE TABLE p_ci_runner_machine_builds')
+  end
+
+  # no-op
+  def down; end
+end
diff --git a/db/post_migrate/20230329091300_swap_ci_runner_machine_builds_primary_key_v2.rb b/db/post_migrate/20230329091300_swap_ci_runner_machine_builds_primary_key_v2.rb
new file mode 100644
index 00000000000..ad40ed118b1
--- /dev/null
+++ b/db/post_migrate/20230329091300_swap_ci_runner_machine_builds_primary_key_v2.rb
@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+class SwapCiRunnerMachineBuildsPrimaryKeyV2 < Gitlab::Database::Migration[2.1]
+  include Gitlab::Database::PartitioningMigrationHelpers
+
+  disable_ddl_transaction!
+
+  TABLE_NAME = :p_ci_runner_machine_builds
+  BUILDS_TABLE = :ci_builds
+
+  def up
+    reorder_primary_key_columns([:build_id, :partition_id])
+  end
+
+  def down
+    reorder_primary_key_columns([:partition_id, :build_id])
+  end
+
+  private
+
+  def reorder_primary_key_columns(columns)
+    with_lock_retries(raise_on_exhaustion: true) do
+      connection.execute(<<~SQL)
+        LOCK TABLE #{BUILDS_TABLE}, #{TABLE_NAME} IN ACCESS EXCLUSIVE MODE;
+      SQL
+
+      partitions = Gitlab::Database::PostgresPartitionedTable.each_partition(TABLE_NAME).to_a
+      partitions.each { |partition| drop_table partition.identifier }
+
+      execute <<~SQL
+        ALTER TABLE #{TABLE_NAME}
+          DROP CONSTRAINT p_ci_runner_machine_builds_pkey CASCADE;
+
+        ALTER TABLE #{TABLE_NAME}
+          ADD PRIMARY KEY (#{columns.join(', ')});
+      SQL
+
+      partitions.each do |partition|
+        connection.execute(<<~SQL)
+          CREATE TABLE IF NOT EXISTS #{partition.identifier}
+            PARTITION OF #{partition.parent_identifier} #{partition.condition};
+        SQL
+      end
+    end
+  end
+end
diff --git a/db/schema_migrations/20230329091107 b/db/schema_migrations/20230329091107
new file mode 100644
index 00000000000..658d90e662f
--- /dev/null
+++ b/db/schema_migrations/20230329091107
@@ -0,0 +1 @@
+4ca98e9c93245a8fc1f4124d00d47d73d12b961affde1d53b7262ffc93582d83
\ No newline at end of file
diff --git a/db/schema_migrations/20230329091300 b/db/schema_migrations/20230329091300
new file mode 100644
index 00000000000..4a4be644126
--- /dev/null
+++ b/db/schema_migrations/20230329091300
@@ -0,0 +1 @@
+a85e3139d843295e666867129575818f61983a8b16eaa73f9b470e394d9c5476
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 06e4541147b..6c71c7d17ce 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -27376,7 +27376,7 @@ ALTER TABLE ONLY operations_user_lists
     ADD CONSTRAINT operations_user_lists_pkey PRIMARY KEY (id);
 
 ALTER TABLE ONLY p_ci_runner_machine_builds
-    ADD CONSTRAINT p_ci_runner_machine_builds_pkey PRIMARY KEY (partition_id, build_id);
+    ADD CONSTRAINT p_ci_runner_machine_builds_pkey PRIMARY KEY (build_id, partition_id);
 
 ALTER TABLE ONLY packages_build_infos
     ADD CONSTRAINT packages_build_infos_pkey PRIMARY KEY (id);