Add latest changes from gitlab-org/gitlab@master

5 files changed, 31 insertions, 0 deletions

diff --git a/db/migrate/20231108132916_index_batch_tracker_status.rb b/db/migrate/20231108132916_index_batch_tracker_status.rb
new file mode 100644
index 00000000000..099cbae6fc1
--- /dev/null
+++ b/db/migrate/20231108132916_index_batch_tracker_status.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class IndexBatchTrackerStatus < Gitlab::Database::Migration[2.2]
+  disable_ddl_transaction!
+
+  milestone '16.7'
+
+  INDEX_NAME = 'index_batch_trackers_on_tracker_id_status'
+
+  def up
+    add_concurrent_index :bulk_import_batch_trackers, [:tracker_id, :status], name: INDEX_NAME
+  end
+
+  def down
+    remove_concurrent_index_by_name :bulk_import_batch_trackers, INDEX_NAME
+  end
+end
diff --git a/db/migrate/20231108143957_add_concurrent_direct_transfer_batch_limit_to_application_settings.rb b/db/migrate/20231108143957_add_concurrent_direct_transfer_batch_limit_to_application_settings.rb
new file mode 100644
index 00000000000..064385e02fc
--- /dev/null
+++ b/db/migrate/20231108143957_add_concurrent_direct_transfer_batch_limit_to_application_settings.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddConcurrentDirectTransferBatchLimitToApplicationSettings < Gitlab::Database::Migration[2.2]
+  milestone '16.7'
+
+  def change
+    add_column :application_settings, :bulk_import_concurrent_pipeline_batch_limit, :smallint, default: 25, null: false
+  end
+end
diff --git a/db/schema_migrations/20231108132916 b/db/schema_migrations/20231108132916
new file mode 100644
index 00000000000..a7c7d98f18c
--- /dev/null
+++ b/db/schema_migrations/20231108132916
@@ -0,0 +1 @@
+4f67f8ebf48cb7ea22e5451c3b548a5f7dc59b0e2b29d51ac73a04860214a25f
\ No newline at end of file
diff --git a/db/schema_migrations/20231108143957 b/db/schema_migrations/20231108143957
new file mode 100644
index 00000000000..ec3f916ea2e
--- /dev/null
+++ b/db/schema_migrations/20231108143957
@@ -0,0 +1 @@
+fc18cfa407a2270af8be9de77b5078544e27afb38e4ad87f3b2c06e24f58add0
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 9fb23cc0cc4..c008eae969b 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -12276,6 +12276,7 @@ CREATE TABLE application_settings (
     update_namespace_name_rate_limit smallint DEFAULT 120 NOT NULL,
     pre_receive_secret_detection_enabled boolean DEFAULT false NOT NULL,
     can_create_organization boolean DEFAULT true NOT NULL,
+    bulk_import_concurrent_pipeline_batch_limit smallint DEFAULT 25 NOT NULL,
     web_ide_oauth_application_id integer,
     instance_level_ai_beta_features_enabled boolean DEFAULT false NOT NULL,
     security_txt_content text,
@@ -31892,6 +31893,8 @@ CREATE INDEX index_badges_on_group_id ON badges USING btree (group_id);
 
 CREATE INDEX index_badges_on_project_id ON badges USING btree (project_id);
 
+CREATE INDEX index_batch_trackers_on_tracker_id_status ON bulk_import_batch_trackers USING btree (tracker_id, status);
+
 CREATE INDEX index_batched_background_migrations_on_status ON batched_background_migrations USING btree (status);
 
 CREATE UNIQUE INDEX index_batched_background_migrations_on_unique_configuration ON batched_background_migrations USING btree (job_class_name, table_name, column_name, job_arguments);