diff options
author | John Cai <jcai@gitlab.com> | 2020-05-27 23:35:26 +0300 |
---|---|---|
committer | John Cai <jcai@gitlab.com> | 2020-05-27 23:35:26 +0300 |
commit | 2ca5bb95d8177d1446bd409b4c8e1275c4707d20 (patch) | |
tree | afc96218d273fa2f2df7c90252a9bf65203bb584 | |
parent | 3ca6d344861f62e69959a49133b84989ba7dfad2 (diff) |
testing onlyjc-test-auth-error
-rw-r--r-- | internal/service/remote/fetch_internal_remote.go | 10 | ||||
-rw-r--r-- | internal/service/repository/replicate.go | 10 |
2 files changed, 16 insertions, 4 deletions
diff --git a/internal/service/remote/fetch_internal_remote.go b/internal/service/remote/fetch_internal_remote.go index 7f3512c3a..a3324fa64 100644 --- a/internal/service/remote/fetch_internal_remote.go +++ b/internal/service/remote/fetch_internal_remote.go @@ -26,15 +26,17 @@ func (s *server) FetchInternalRemote(ctx context.Context, req *gitalypb.FetchInt return nil, status.Errorf(codes.InvalidArgument, "FetchInternalRemote: %v", err) } - if featureflag.IsDisabled(ctx, featureflag.GoFetchInternalRemote) { - return s.rubyFetchInternalRemote(ctx, req) - } - env, err := gitalyssh.UploadPackEnv(ctx, &gitalypb.SSHUploadPackRequest{Repository: req.RemoteRepository}) if err != nil { return nil, err } + fmt.Printf("\n\nENV: %+v\n\n", env) + + if featureflag.IsDisabled(ctx, featureflag.GoFetchInternalRemote) { + return s.rubyFetchInternalRemote(ctx, req) + } + repoPath, err := helper.GetRepoPath(req.Repository) if err != nil { return nil, err diff --git a/internal/service/repository/replicate.go b/internal/service/repository/replicate.go index 3952bd242..861a641de 100644 --- a/internal/service/repository/replicate.go +++ b/internal/service/repository/replicate.go @@ -8,6 +8,7 @@ import ( "os" "os/exec" "path/filepath" + "time" "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" gitalyauth "gitlab.com/gitlab-org/gitaly/auth" @@ -150,6 +151,8 @@ func (s *server) createFromSnapshot(ctx context.Context, in *gitalypb.ReplicateR return err } + time.Sleep(1 * time.Minute) + return nil } @@ -159,6 +162,13 @@ func (s *server) syncRepository(ctx context.Context, in *gitalypb.ReplicateRepos return err } + servers, err := helper.ExtractGitalyServers(ctx) + if err != nil { + return err + } + + fmt.Printf("\n\nSERVERSZZ: %v\n", servers) + resp, err := remoteClient.FetchInternalRemote(ctx, &gitalypb.FetchInternalRemoteRequest{ Repository: in.GetRepository(), RemoteRepository: in.GetSource(), |