Merge branch 'sync-merge-ref-upon-mergeability-check' into 'master'

Automatically update MR merge-ref along merge status

See merge request gitlab-org/gitlab-ce!29569

2 files changed, 26 insertions, 1 deletions

diff --git a/db/post_migrate/20190620112608_enqueue_reset_merge_status_second_run.rb b/db/post_migrate/20190620112608_enqueue_reset_merge_status_second_run.rb
new file mode 100644
index 00000000000..2d096a2a39c
--- /dev/null
+++ b/db/post_migrate/20190620112608_enqueue_reset_merge_status_second_run.rb
@@ -0,0 +1,25 @@
+# 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 EnqueueResetMergeStatusSecondRun < ActiveRecord::Migration[5.1]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+  BATCH_SIZE = 10_000
+  MIGRATION = 'ResetMergeStatus'
+  DELAY_INTERVAL = 5.minutes.to_i
+
+  disable_ddl_transaction!
+
+  def up
+    say 'Scheduling `ResetMergeStatus` jobs'
+
+    # We currently have more than ~5_000_000 merge request records on GitLab.com.
+    # This means it'll schedule ~500 jobs (10k MRs each) with a 5 minutes gap,
+    # so this should take ~41 hours for all background migrations to complete.
+    # ((5_000_000 / 10_000) * 5) / 60 => 41.6666..
+    queue_background_migration_jobs_by_range_at_intervals(MergeRequest, MIGRATION, DELAY_INTERVAL, batch_size: BATCH_SIZE)
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index c1c67e012e9..f6cf2ee07e3 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20190619175843) do
+ActiveRecord::Schema.define(version: 20190620112608) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"