Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 1 deletions

diff --git a/lib/gitlab/database/async_indexes/migration_helpers.rb b/lib/gitlab/database/async_indexes/migration_helpers.rb
index 0afb47ef16d..2f990aba2fb 100644
--- a/lib/gitlab/database/async_indexes/migration_helpers.rb
+++ b/lib/gitlab/database/async_indexes/migration_helpers.rb
@@ -55,11 +55,14 @@ module Gitlab
           schema_creation = ActiveRecord::ConnectionAdapters::PostgreSQL::SchemaCreation.new(ApplicationRecord.connection)
           definition = schema_creation.accept(create_index)
 
-          async_index = PostgresAsyncIndex.safe_find_or_create_by!(name: index_name) do |rec|
+          async_index = PostgresAsyncIndex.find_or_create_by!(name: index_name) do |rec|
             rec.table_name = table_name
             rec.definition = definition
           end
 
+          async_index.definition = definition
+          async_index.save! # No-op if definition is not changed
+
           Gitlab::AppLogger.info(
             message: 'Prepared index for async creation',
             table_name: async_index.table_name,