Merge branch 'smh-fix-rails-tests-repository-replicas' into 'master'

Rewrite relative path in RepositoryReplicas conditionally

See merge request gitlab-org/gitaly!4390

2 files changed, 8 insertions, 4 deletions

diff --git a/internal/praefect/info_service_test.go b/internal/praefect/info_service_test.go
index f7a24610e..c89654f6a 100644
--- a/internal/praefect/info_service_test.go
+++ b/internal/praefect/info_service_test.go
@@ -58,7 +58,7 @@ func TestInfoService_RepositoryReplicas(t *testing.T) {
 	const virtualStorage = "default"
 	conf := config.Config{
 		VirtualStorages: []*config.VirtualStorage{{Name: virtualStorage, Nodes: cfgNodes}},
-		Failover:        config.Failover{Enabled: true},
+		Failover:        config.Failover{ElectionStrategy: config.ElectionStrategyPerRepository},
 	}
 
 	ctx := testhelper.Context(t)
diff --git a/internal/praefect/service/info/repositories.go b/internal/praefect/service/info/repositories.go
index ec6bb1a4b..6b00a4f03 100644
--- a/internal/praefect/service/info/repositories.go
+++ b/internal/praefect/service/info/repositories.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 
 	"gitlab.com/gitlab-org/gitaly/v14/internal/helper"
+	"gitlab.com/gitlab-org/gitaly/v14/internal/praefect/config"
 	"gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb"
 	"golang.org/x/sync/errgroup"
 )
@@ -29,9 +30,12 @@ func (s *Server) RepositoryReplicas(ctx context.Context, in *gitalypb.Repository
 		return nil, fmt.Errorf("get host assignments: %w", err)
 	}
 
-	replicaPath, err := s.rs.GetReplicaPath(ctx, repositoryID)
-	if err != nil {
-		return nil, fmt.Errorf("get replica path: %w", err)
+	replicaPath := relativePath
+	if s.conf.Failover.ElectionStrategy == config.ElectionStrategyPerRepository {
+		replicaPath, err = s.rs.GetReplicaPath(ctx, repositoryID)
+		if err != nil {
+			return nil, fmt.Errorf("get replica path: %w", err)
+		}
 	}
 
 	secondaries := make([]string, 0, len(assignments)-1)