1 files changed, 6 insertions, 1 deletions
diff --git a/lib/gitlab/database/postgres_autovacuum_activity.rb b/lib/gitlab/database/postgres_autovacuum_activity.rb
index a4dc199c259..6a80c631abb 100644
--- a/lib/gitlab/database/postgres_autovacuum_activity.rb
+++ b/lib/gitlab/database/postgres_autovacuum_activity.rb
@@ -6,9 +6,14 @@ module Gitlab
       self.table_name = 'postgres_autovacuum_activity'
       self.primary_key = 'table_identifier'
 
+      scope :wraparound_prevention, -> { where(wraparound_prevention: true) }
+
       def self.for_tables(tables)
         Gitlab::Database::LoadBalancing::Session.current.use_primary do
-          where('schema = current_schema()').where(table: tables)
+          # calling `.to_a` here to execute the query in the primary's scope
+          # and to avoid having the scope chained and re-executed
+          #
+          where('schema = current_schema()').where(table: tables).to_a
         end
       end