Merge branch '288005-fix-self-managed-run-on-gitlab-com-only-and-migrate-back' into 'master'

Migrate PK conversion for push_event_payloads back (only for GitLab.com)

See merge request gitlab-org/gitlab!65112

db/post_migrate/20210622041846_finalize_push_event_payloads_bigint_conversion.rb

@@ -9,6 +9,8 @@ class FinalizePushEventPayloadsBigintConversion < ActiveRecord::Migration[6.1]
   INDEX_NAME = 'index_push_event_payloads_on_event_id_convert_to_bigint'
 
   def up
+    return unless should_run?
+
     ensure_batched_background_migration_is_finished(
       job_class_name: 'CopyColumnUsingBackgroundMigrationJob',
       table_name: TABLE_NAME,
@@ -20,11 +22,17 @@ class FinalizePushEventPayloadsBigintConversion < ActiveRecord::Migration[6.1]
   end
 
   def down
+    return unless should_run?
+
     swap_columns
   end
 
   private
 
+  def should_run?
+    Gitlab.dev_or_test_env? || Gitlab.com?
+  end
+
   def swap_columns
     add_concurrent_index TABLE_NAME, :event_id_convert_to_bigint, unique: true, name: INDEX_NAME
 

db/post_migrate/20210630025020_migrate_push_event_payloads_event_id_back_to_integer_for_gitlab_com.rb

+# frozen_string_literal: true
+
+require Rails.root.join('db', 'post_migrate', '20210622041846_finalize_push_event_payloads_bigint_conversion')
+
+class MigratePushEventPayloadsEventIdBackToIntegerForGitlabCom < ActiveRecord::Migration[6.1]
+  disable_ddl_transaction!
+
+  def up
+    FinalizePushEventPayloadsBigintConversion.new.down
+  end
+
+  def down
+    FinalizePushEventPayloadsBigintConversion.new.up
+  end
+end

db/schema_migrations/20210630025020

+71ad8c8f2419721f8fdf6c6bbd1265c4a7ca277972c59319e155bc6dfc46aa48
\ No newline at end of file

db/structure.sql

@@ -17376,7 +17376,7 @@ ALTER SEQUENCE protected_tags_id_seq OWNED BY protected_tags.id;
 
 CREATE TABLE push_event_payloads (
     commit_count bigint NOT NULL,
-    event_id_convert_to_bigint integer DEFAULT 0 NOT NULL,
+    event_id integer NOT NULL,
     action smallint NOT NULL,
     ref_type smallint NOT NULL,
     commit_from bytea,
@@ -17384,7 +17384,7 @@ CREATE TABLE push_event_payloads (
     ref text,
     commit_title character varying(70),
     ref_count integer,
-    event_id bigint NOT NULL
+    event_id_convert_to_bigint bigint DEFAULT 0 NOT NULL
 );
 
 CREATE TABLE push_rules (