Merge branch 'pks-gitaly-fix-force-routing' into 'master'

Fix force-routing to Gitaly primary with empty hook env

See merge request gitlab-org/gitlab!54317

changelogs/unreleased/pks-gitaly-fix-force-routing.yml

+---
+title: Fix force-routing to Gitaly primary with empty hook env
+merge_request: 54317
+author:
+type: fixed

lib/gitlab/gitaly_client.rb

@@ -248,6 +248,8 @@ module Gitlab
 
       return {} unless Gitlab::SafeRequestStore[:gitlab_git_env]
 
+      return {} if Gitlab::SafeRequestStore[:gitlab_git_env].empty?
+
       { 'gitaly-route-repository-accessor-policy' => 'primary-only' }
     end
     private_class_method :route_to_primary

spec/lib/gitlab/gitaly_client_spec.rb

@@ -305,9 +305,21 @@ RSpec.describe Gitlab::GitalyClient do
         end
       end
 
-      context 'when RequestStore is enabled with git_env', :request_store do
+      context 'when RequestStore is enabled with empty git_env', :request_store do
         before do
-          Gitlab::SafeRequestStore[:gitlab_git_env] = true
+          Gitlab::SafeRequestStore[:gitlab_git_env] = {}
+        end
+
+        it 'disables force-routing to primary' do
+          expect(described_class.request_kwargs('default', timeout: 1)[:metadata][policy]).to be_nil
+        end
+      end
+
+      context 'when RequestStore is enabled with populated git_env', :request_store do
+        before do
+          Gitlab::SafeRequestStore[:gitlab_git_env] = {
+            "GIT_OBJECT_DIRECTORY_RELATIVE" => "foo/bar"
+          }
         end
 
         it 'enables force-routing to primary' do