summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Drozdov <idrozdov@gitlab.com>2019-09-05 17:08:46 +0300
committerIgor Drozdov <idrozdov@gitlab.com>2019-09-12 18:12:57 +0300
commit024178ea5a186ea9b6489bb5e5de0d292d26c386 (patch)
treef75a377f32aef4f495aa98ce4cb46cf49f499b03
parent25cb337cf12438169f1b14bc5dace8a06a7356e3 (diff)
downloadgitlab-ce-id-any-approver-rules-migration.tar.gz
Backport for any approval rule migrationid-any-approver-rules-migration
Adds database migrations in order to keep the database consistent
-rw-r--r--db/migrate/20190910212256_add_any_approver_rule_unique_indexes.rb30
-rw-r--r--db/post_migrate/20190905091812_schedule_project_any_approval_rule_migration.rb33
-rw-r--r--db/post_migrate/20190905091831_schedule_merge_request_any_approval_rule_migration.rb33
-rw-r--r--db/schema.rb2
4 files changed, 98 insertions, 0 deletions
diff --git a/db/migrate/20190910212256_add_any_approver_rule_unique_indexes.rb b/db/migrate/20190910212256_add_any_approver_rule_unique_indexes.rb
new file mode 100644
index 00000000000..e8f5b853d1d
--- /dev/null
+++ b/db/migrate/20190910212256_add_any_approver_rule_unique_indexes.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+# See http://doc.gitlab.com/ce/development/migration_style_guide.html
+# for more information on how to write migrations for GitLab.
+
+class AddAnyApproverRuleUniqueIndexes < ActiveRecord::Migration[5.2]
+ include Gitlab::Database::MigrationHelpers
+
+ DOWNTIME = false
+
+ PROJECT_RULE_UNIQUE_INDEX = 'any_approver_project_rule_type_unique_index'
+ MERGE_REQUEST_RULE_UNIQUE_INDEX = 'any_approver_merge_request_rule_type_unique_index'
+
+ disable_ddl_transaction!
+
+ def up
+ add_concurrent_index(:approval_project_rules, [:project_id],
+ where: "rule_type = 3",
+ name: PROJECT_RULE_UNIQUE_INDEX, unique: true)
+
+ add_concurrent_index(:approval_merge_request_rules, [:merge_request_id, :rule_type],
+ where: "rule_type = 4",
+ name: MERGE_REQUEST_RULE_UNIQUE_INDEX, unique: true)
+ end
+
+ def down
+ remove_concurrent_index_by_name(:approval_project_rules, PROJECT_RULE_UNIQUE_INDEX)
+ remove_concurrent_index_by_name(:approval_merge_request_rules, MERGE_REQUEST_RULE_UNIQUE_INDEX)
+ end
+end
diff --git a/db/post_migrate/20190905091812_schedule_project_any_approval_rule_migration.rb b/db/post_migrate/20190905091812_schedule_project_any_approval_rule_migration.rb
new file mode 100644
index 00000000000..7d3a41f0957
--- /dev/null
+++ b/db/post_migrate/20190905091812_schedule_project_any_approval_rule_migration.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+# See http://doc.gitlab.com/ce/development/migration_style_guide.html
+# for more information on how to write migrations for GitLab.
+
+class ScheduleProjectAnyApprovalRuleMigration < ActiveRecord::Migration[5.2]
+ include Gitlab::Database::MigrationHelpers
+
+ DOWNTIME = false
+ BATCH_SIZE = 25_000
+ MIGRATION = 'PopulateAnyApprovalRuleForProjects'
+ DELAY_INTERVAL = 8.minutes.to_i
+
+ disable_ddl_transaction!
+
+ def up
+ return unless Gitlab.ee?
+
+ say "Scheduling `#{MIGRATION}` jobs"
+
+ # We currently have ~10_300_000 project records on GitLab.com.
+ # This means it'll schedule ~400 jobs (25k projects each) with a 8 minutes gap,
+ # so this should take ~53 hours (~2 days) for all background migrations to complete.
+ #
+ # The approximate expected number of affected rows is: 18k
+
+ queue_background_migration_jobs_by_range_at_intervals(Project, MIGRATION, DELAY_INTERVAL, batch_size: BATCH_SIZE)
+ end
+
+ def down
+ # no-op
+ end
+end
diff --git a/db/post_migrate/20190905091831_schedule_merge_request_any_approval_rule_migration.rb b/db/post_migrate/20190905091831_schedule_merge_request_any_approval_rule_migration.rb
new file mode 100644
index 00000000000..9db4ca437d6
--- /dev/null
+++ b/db/post_migrate/20190905091831_schedule_merge_request_any_approval_rule_migration.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+# See http://doc.gitlab.com/ce/development/migration_style_guide.html
+# for more information on how to write migrations for GitLab.
+
+class ScheduleMergeRequestAnyApprovalRuleMigration < ActiveRecord::Migration[5.2]
+ include Gitlab::Database::MigrationHelpers
+
+ DOWNTIME = false
+ BATCH_SIZE = 25_000
+ MIGRATION = 'PopulateAnyApprovalRuleForMergeRequests'
+ DELAY_INTERVAL = 8.minutes.to_i
+
+ disable_ddl_transaction!
+
+ def up
+ return unless Gitlab.ee?
+
+ say "Scheduling `#{MIGRATION}` jobs"
+
+ # We currently have ~29_300_000 merge request records on GitLab.com.
+ # This means it'll schedule ~1160 jobs (25k merge requests each) with a 8 minutes gap,
+ # so this should take ~156 hours (~6.5 days) for all background migrations to complete.
+ #
+ # The approximate expected number of affected rows is: 190k
+
+ queue_background_migration_jobs_by_range_at_intervals(MergeRequest, MIGRATION, DELAY_INTERVAL, batch_size: BATCH_SIZE)
+ end
+
+ def down
+ # no-op
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 39faf1e651e..c339fa4bf15 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -311,6 +311,7 @@ ActiveRecord::Schema.define(version: 2019_09_12_061145) do
t.index ["merge_request_id", "code_owner", "name"], name: "approval_rule_name_index_for_code_owners", unique: true, where: "(code_owner = true)"
t.index ["merge_request_id", "code_owner"], name: "index_approval_merge_request_rules_1"
t.index ["merge_request_id", "rule_type", "name"], name: "index_approval_rule_name_for_code_owners_rule_type", unique: true, where: "(rule_type = 2)"
+ t.index ["merge_request_id", "rule_type"], name: "any_approver_merge_request_rule_type_unique_index", unique: true, where: "(rule_type = 4)"
t.index ["merge_request_id", "rule_type"], name: "index_approval_rules_code_owners_rule_type", where: "(rule_type = 2)"
end
@@ -342,6 +343,7 @@ ActiveRecord::Schema.define(version: 2019_09_12_061145) do
t.integer "approvals_required", limit: 2, default: 0, null: false
t.string "name", null: false
t.integer "rule_type", limit: 2, default: 0, null: false
+ t.index ["project_id"], name: "any_approver_project_rule_type_unique_index", unique: true, where: "(rule_type = 3)"
t.index ["project_id"], name: "index_approval_project_rules_on_project_id"
t.index ["rule_type"], name: "index_approval_project_rules_on_rule_type"
end