1 files changed, 3 insertions, 7 deletions
diff --git a/lib/gitlab/database/reindexing/reindex_concurrently.rb b/lib/gitlab/database/reindexing/reindex_concurrently.rb
index 7a720f7c539..152935bd734 100644
--- a/lib/gitlab/database/reindexing/reindex_concurrently.rb
+++ b/lib/gitlab/database/reindexing/reindex_concurrently.rb
@@ -8,7 +8,7 @@ module Gitlab
         ReindexError = Class.new(StandardError)
 
         TEMPORARY_INDEX_PATTERN = '\_ccnew[0-9]*'
-        STATEMENT_TIMEOUT = 9.hours
+        STATEMENT_TIMEOUT = 24.hours
         PG_MAX_INDEX_NAME_LENGTH = 63
 
         attr_reader :index, :logger
@@ -99,6 +99,7 @@ module Gitlab
           logger.info("Removing dangling index #{index.identifier}")
 
           retries = Gitlab::Database::WithLockRetriesOutsideTransaction.new(
+            connection: connection,
             timing_configuration: REMOVE_INDEX_RETRY_CONFIG,
             klass: self.class,
             logger: logger
@@ -109,11 +110,6 @@ module Gitlab
           end
         end
 
-        def with_lock_retries(&block)
-          arguments = { klass: self.class, logger: logger }
-          Gitlab::Database::WithLockRetries.new(**arguments).run(raise_on_exhaustion: true, &block)
-        end
-
         def set_statement_timeout
           execute("SET statement_timeout TO '%ds'" % STATEMENT_TIMEOUT)
           yield
@@ -123,7 +119,7 @@ module Gitlab
 
         delegate :execute, :quote_table_name, to: :connection
         def connection
-          @connection ||= ActiveRecord::Base.connection
+          @connection ||= index.connection
         end
       end
     end