Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42

1 files changed, 1 insertions, 5 deletions

diff --git a/lib/gitlab/database/async_indexes/index_destructor.rb b/lib/gitlab/database/async_indexes/index_destructor.rb
index fe05872b87a..66955df9d04 100644
--- a/lib/gitlab/database/async_indexes/index_destructor.rb
+++ b/lib/gitlab/database/async_indexes/index_destructor.rb
@@ -4,7 +4,7 @@ module Gitlab
   module Database
     module AsyncIndexes
       class IndexDestructor
-        include ExclusiveLeaseGuard
+        include IndexingExclusiveLeaseGuard
 
         TIMEOUT_PER_ACTION = 1.day
 
@@ -53,10 +53,6 @@ module Gitlab
           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