1 files changed, 9 insertions, 2 deletions
diff --git a/app/models/application_record.rb b/app/models/application_record.rb
index 06ff18ca409..198a3653cd3 100644
--- a/app/models/application_record.rb
+++ b/app/models/application_record.rb
@@ -5,6 +5,7 @@ class ApplicationRecord < ActiveRecord::Base
   include Transactions
   include LegacyBulkInsert
   include CrossDatabaseModification
+  include SensitiveSerializableHash
 
   self.abstract_class = true
 
@@ -60,8 +61,10 @@ class ApplicationRecord < ActiveRecord::Base
   end
 
   # Start a new transaction with a shorter-than-usual statement timeout. This is
-  # currently one third of the default 15-second timeout
-  def self.with_fast_read_statement_timeout(timeout_ms = 5000)
+  # currently one third of the default 15-second timeout with a 500ms buffer
+  # to allow callers gracefully handling the errors to still complete within
+  # the 5s target duration of a low urgency request.
+  def self.with_fast_read_statement_timeout(timeout_ms = 4500)
     ::Gitlab::Database::LoadBalancing::Session.current.fallback_to_replicas_for_ambiguous_queries do
       transaction(requires_new: true) do # rubocop:disable Performance/ActiveRecordSubtransactions
         connection.exec_query("SET LOCAL statement_timeout = #{timeout_ms}")
@@ -99,6 +102,10 @@ class ApplicationRecord < ActiveRecord::Base
     where('EXISTS (?)', query.select(1))
   end
 
+  def self.where_not_exists(query)
+    where('NOT EXISTS (?)', query.select(1))
+  end
+
   def self.declarative_enum(enum_mod)
     enum(enum_mod.key => enum_mod.values)
   end