Add latest changes from gitlab-org/gitlab@13-3-stable-ee

1 files changed, 25 insertions, 0 deletions

diff --git a/db/migrate/20200811055018_remove_not_null_constraint_on_type_from_audit_events.rb b/db/migrate/20200811055018_remove_not_null_constraint_on_type_from_audit_events.rb
new file mode 100644
index 00000000000..25c3ef71655
--- /dev/null
+++ b/db/migrate/20200811055018_remove_not_null_constraint_on_type_from_audit_events.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class RemoveNotNullConstraintOnTypeFromAuditEvents < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  # To avoid deadlock on audit_event and audit_event_part... since there is a trigger to insert record from audit_events
+  # to audit_events_part..., we need to ensure each ALTER TABLE command run in its own transaction.
+  def up
+    with_lock_retries do
+      change_column_null :audit_events_part_5fc467ac26, :type, true
+    end
+
+    with_lock_retries do
+      change_column_null :audit_events, :type, true
+    end
+  end
+
+  def down
+    # no-op -- null values might be added after this constraint is removed.
+  end
+end