Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'internal/gitaly/service/objectpool/link.go')
-rw-r--r--internal/gitaly/service/objectpool/link.go11
1 files changed, 9 insertions, 2 deletions
diff --git a/internal/gitaly/service/objectpool/link.go b/internal/gitaly/service/objectpool/link.go
index 3e378d40b..cb57a1ecf 100644
--- a/internal/gitaly/service/objectpool/link.go
+++ b/internal/gitaly/service/objectpool/link.go
@@ -4,6 +4,7 @@ import (
"context"
"gitlab.com/gitlab-org/gitaly/v14/internal/helper"
+ "gitlab.com/gitlab-org/gitaly/v14/internal/metadata/featureflag"
"gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
@@ -21,11 +22,17 @@ func (s *server) LinkRepositoryToObjectPool(ctx context.Context, req *gitalypb.L
repo := s.localrepo(req.GetRepository())
- if err := pool.Init(ctx); err != nil {
- return nil, helper.ErrInternal(err)
+ if featureflag.LinkRepositoryToObjectPoolNotFound.IsDisabled(ctx) {
+ if err := pool.Init(ctx); err != nil {
+ return nil, helper.ErrInternal(err)
+ }
}
if err := pool.Link(ctx, repo); err != nil {
+ if featureflag.LinkRepositoryToObjectPoolNotFound.IsEnabled(ctx) {
+ return nil, helper.ErrInternal(err)
+ }
+
return nil, helper.ErrInternal(helper.SanitizeError(err))
}