Add latest changes from gitlab-org/gitlab@15-3-stable-eev15.3.0-rc42

3 files changed, 101 insertions, 0 deletions

diff --git a/lib/gitlab/database/async_indexes/index_destructor.rb b/lib/gitlab/database/async_indexes/index_destructor.rb
new file mode 100644
index 00000000000..fe05872b87a
--- /dev/null
+++ b/lib/gitlab/database/async_indexes/index_destructor.rb
@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Database
+    module AsyncIndexes
+      class IndexDestructor
+        include ExclusiveLeaseGuard
+
+        TIMEOUT_PER_ACTION = 1.day
+
+        def initialize(async_index)
+          @async_index = async_index
+        end
+
+        def perform
+          try_obtain_lease do
+            if !index_exists?
+              log_index_info('Skipping dropping as the index does not exist')
+            else
+              log_index_info('Dropping async index')
+
+              retries = Gitlab::Database::WithLockRetriesOutsideTransaction.new(
+                connection: connection,
+                timing_configuration: Gitlab::Database::Reindexing::REMOVE_INDEX_RETRY_CONFIG,
+                klass: self.class,
+                logger: Gitlab::AppLogger
+              )
+
+              retries.run(raise_on_exhaustion: false) do
+                connection.execute(async_index.definition)
+              end
+
+              log_index_info('Finished dropping async index')
+            end
+
+            async_index.destroy
+          end
+        end
+
+        private
+
+        attr_reader :async_index
+
+        def index_exists?
+          connection.indexes(async_index.table_name).any? { |index| index.name == async_index.name }
+        end
+
+        def connection
+          @connection ||= async_index.connection
+        end
+
+        def lease_timeout
+          TIMEOUT_PER_ACTION
+        end
+
+        def lease_key
+          [super, async_index.connection_db_config.name].join('/')
+        end
+
+        def log_index_info(message)
+          Gitlab::AppLogger.info(message: message, table_name: async_index.table_name, index_name: async_index.name)
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/database/async_indexes/migration_helpers.rb b/lib/gitlab/database/async_indexes/migration_helpers.rb
index e9846dd4e85..c8f6761534c 100644
--- a/lib/gitlab/database/async_indexes/migration_helpers.rb
+++ b/lib/gitlab/database/async_indexes/migration_helpers.rb
@@ -77,6 +77,38 @@ module Gitlab
           async_index
         end
 
+        # Prepares an index for asynchronous destruction.
+        #
+        # Stores the index information in the postgres_async_indexes table to be removed later. The
+        # index will be always be removed CONCURRENTLY, so that option does not need to be given.
+        #
+        # If the requested index has already been removed, it is not stored in the table for
+        # asynchronous destruction.
+        def prepare_async_index_removal(table_name, column_name, options = {})
+          index_name = options.fetch(:name)
+          raise 'prepare_async_index_removal must get an index name defined' if index_name.blank?
+
+          unless index_exists?(table_name, column_name, **options)
+            Gitlab::AppLogger.warn "Index not removed because it does not exist (this may be due to an aborted migration or similar): table_name: #{table_name}, index_name: #{index_name}"
+            return
+          end
+
+          definition = "DROP INDEX CONCURRENTLY #{quote_column_name(index_name)}"
+
+          async_index = PostgresAsyncIndex.find_or_create_by!(name: index_name) do |rec|
+            rec.table_name = table_name
+            rec.definition = definition
+          end
+
+          Gitlab::AppLogger.info(
+            message: 'Prepared index for async destruction',
+            table_name: async_index.table_name,
+            index_name: async_index.name
+          )
+
+          async_index
+        end
+
         def async_index_creation_available?
           connection.table_exists?(:postgres_async_indexes)
         end
diff --git a/lib/gitlab/database/async_indexes/postgres_async_index.rb b/lib/gitlab/database/async_indexes/postgres_async_index.rb
index 6cb40729061..dc932482d40 100644
--- a/lib/gitlab/database/async_indexes/postgres_async_index.rb
+++ b/lib/gitlab/database/async_indexes/postgres_async_index.rb
@@ -13,6 +13,9 @@ module Gitlab
         validates :table_name, presence: true, length: { maximum: MAX_IDENTIFIER_LENGTH }
         validates :definition, presence: true, length: { maximum: MAX_DEFINITION_LENGTH }
 
+        scope :to_create, -> { where("definition ILIKE 'CREATE%'") }
+        scope :to_drop, -> { where("definition ILIKE 'DROP%'") }
+
         def to_s
           definition
         end