Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

1 files changed, 18 insertions, 0 deletions

diff --git a/db/migrate/20210430154631_add_slice_multiplier_and_max_slices_to_elastic_reindexing_task.rb b/db/migrate/20210430154631_add_slice_multiplier_and_max_slices_to_elastic_reindexing_task.rb
new file mode 100644
index 00000000000..be022c1b973
--- /dev/null
+++ b/db/migrate/20210430154631_add_slice_multiplier_and_max_slices_to_elastic_reindexing_task.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+class AddSliceMultiplierAndMaxSlicesToElasticReindexingTask < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DEFAULT_MAX_TOTAL_SLICES_RUNNING = 60
+  DEFAULT_SLICE_MULTIPLIER = 2
+
+  def change
+    add_column :elastic_reindexing_tasks, :max_slices_running, :integer,
+               limit: 2,
+               default: DEFAULT_MAX_TOTAL_SLICES_RUNNING,
+               null: false
+    add_column :elastic_reindexing_tasks, :slice_multiplier, :integer,
+               limit: 2,
+               default: DEFAULT_SLICE_MULTIPLIER,
+               null: false
+  end
+end