Merge branch 'stomlinson/load-balancer-low-statement-timeout-2' into 'master'

Reapply "Merge branch 'stomlinson/use-pod-ff-for-load-balancer-statement-timeout' into 'master'"

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/169019



Merged-by: Matt Kasa <mkasa@gitlab.com>
Approved-by: Max Orefice <morefice@gitlab.com>
Approved-by: Matt Kasa <mkasa@gitlab.com>
Reviewed-by: Max Orefice <morefice@gitlab.com>
Co-authored-by: Simon Tomlinson <stomlinson@gitlab.com>

lib/gitlab/database/load_balancing/host.rb

@@ -328,7 +328,7 @@ def double_replication_lag_time?
         end
         def low_timeout_for_host_queries?
-          Feature.enabled?(:load_balancer_low_statement_timeout)
+          Feature.enabled?(:load_balancer_low_statement_timeout, Feature.current_pod)
         end
       end
     end

spec/lib/gitlab/database/load_balancing/host_spec.rb

@@ -448,7 +448,7 @@ def expect_next_replica_connection
     context 'with the flag set' do
       before do
-        stub_feature_flags(load_balancer_low_statement_timeout: true)
+        stub_feature_flags(load_balancer_low_statement_timeout: Feature.current_pod)
       end
       it 'returns quickly if the underlying query takes a long time' do