Add latest changes from gitlab-org/gitlab@master

4 files changed, 128 insertions, 2 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..ef1cb452c26
--- /dev/null
+++ b/db/post_migrate/20190905091812_schedule_project_any_approval_rule_migration.rb
@@ -0,0 +1,47 @@
+# 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 = 5_000
+  MIGRATION = 'PopulateAnyApprovalRuleForProjects'
+  DELAY_INTERVAL = 8.minutes.to_i
+
+  disable_ddl_transaction!
+
+  class Project < ActiveRecord::Base
+    include EachBatch
+
+    self.table_name = 'projects'
+
+    scope :with_approvals_before_merge, -> { where('approvals_before_merge <> 0') }
+  end
+
+  def up
+    add_concurrent_index :projects, :id,
+      name: 'tmp_projects_with_approvals_before_merge',
+      where: 'approvals_before_merge <> 0'
+
+    say "Scheduling `#{MIGRATION}` jobs"
+
+    # We currently have ~43k project records with non-zero approvals_before_merge on GitLab.com.
+    # This means it'll schedule ~9 jobs (5k projects each) with a 8 minutes gap,
+    # so this should take ~1 hour for all background migrations to complete.
+    #
+    # The approximate expected number of affected rows is: 18k
+
+    queue_background_migration_jobs_by_range_at_intervals(
+      ScheduleProjectAnyApprovalRuleMigration::Project.with_approvals_before_merge,
+      MIGRATION, DELAY_INTERVAL, batch_size: BATCH_SIZE)
+
+    remove_concurrent_index_by_name(:projects, 'tmp_projects_with_approvals_before_merge')
+  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..4a8398a9eea
--- /dev/null
+++ b/db/post_migrate/20190905091831_schedule_merge_request_any_approval_rule_migration.rb
@@ -0,0 +1,47 @@
+# 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 = 5_000
+  MIGRATION = 'PopulateAnyApprovalRuleForMergeRequests'
+  DELAY_INTERVAL = 8.minutes.to_i
+
+  disable_ddl_transaction!
+
+  class MergeRequest < ActiveRecord::Base
+    include EachBatch
+
+    self.table_name = 'merge_requests'
+
+    scope :with_approvals_before_merge, -> { where('approvals_before_merge <> 0') }
+  end
+
+  def up
+    add_concurrent_index :merge_requests, :id,
+      name: 'tmp_merge_requests_with_approvals_before_merge',
+      where: 'approvals_before_merge <> 0'
+
+    say "Scheduling `#{MIGRATION}` jobs"
+
+    # We currently have ~440_000 merge request records with non-zero approvals_before_merge on GitLab.com.
+    # This means it'll schedule ~88 jobs (5k merge requests each) with a 8 minutes gap,
+    # so this should take ~12 hours for all background migrations to complete.
+    #
+    # The approximate expected number of affected rows is: 190k
+
+    queue_background_migration_jobs_by_range_at_intervals(
+      ScheduleMergeRequestAnyApprovalRuleMigration::MergeRequest.with_approvals_before_merge,
+      MIGRATION, DELAY_INTERVAL, batch_size: BATCH_SIZE)
+
+    remove_concurrent_index_by_name(:merge_requests, 'tmp_merge_requests_with_approvals_before_merge')
+  end
+
+  def down
+    # no-op
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 64d29d7cc05..b43779f4126 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -319,8 +319,9 @@ ActiveRecord::Schema.define(version: 2019_09_12_061145) do
     t.integer "report_type", limit: 2
     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: "index_approval_rules_code_owners_rule_type", where: "(rule_type = 2)"
+    t.index ["merge_request_id", "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"], name: "index_approval_rules_code_owners_rule_type", where: "(rule_type = 2)"
   end
 
   create_table "approval_merge_request_rules_approved_approvers", force: :cascade do |t|
@@ -351,6 +352,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