Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42

1 files changed, 5 insertions, 15 deletions

diff --git a/lib/gitlab/database/consistency.rb b/lib/gitlab/database/consistency.rb
index e99ea7a3232..17c16640e4c 100644
--- a/lib/gitlab/database/consistency.rb
+++ b/lib/gitlab/database/consistency.rb
@@ -4,28 +4,18 @@ module Gitlab
   module Database
     ##
     # This class is used to make it possible to ensure read consistency in
-    # GitLab EE without the need of overriding a lot of methods / classes /
+    # GitLab without the need of overriding a lot of methods / classes /
     # classs.
     #
-    # This is a CE class that does nothing in CE, because database load
-    # balancing is EE-only feature, but you can still use it in CE. It will
-    # start ensuring read consistency once it is overridden in EE.
-    #
-    # Using this class in CE helps to avoid creeping discrepancy between CE /
-    # EE only to force usage of the primary database in EE.
-    #
     class Consistency
       ##
-      # In CE there is no database load balancing, so all reads are expected to
-      # be consistent by the ACID guarantees of a single PostgreSQL instance.
-      #
-      # This method is overridden in EE.
+      # Within the block, disable the database load balancing for calls that
+      # require read consistency after recent writes.
       #
       def self.with_read_consistency(&block)
-        yield
+        ::Gitlab::Database::LoadBalancing::Session
+          .current.use_primary(&block)
       end
     end
   end
 end
-
-::Gitlab::Database::Consistency.singleton_class.prepend_mod_with('Gitlab::Database::Consistency')