From 30cd8d4dadeda3d643c05a50a6837e616b905aba Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Sat, 12 Dec 2020 00:58:16 -0800 Subject: [PATCH 1/3] Speed up cloning of local forks Cloning a forked repo on the same shard is slow because the normal Git transport has to negotiate refs, pack, and unpack objects. This commit introduces an `allow_local` flag, which uses the --local and --no-hardlinks command-line arguments if the source and target projects reside on the same storage shard. Relates to https://gitlab.com/gitlab-org/gitaly/-/issues/3377 --- .../unreleased/sh-support-local-fork.yml | 5 + internal/gitaly/service/repository/fork.go | 36 +- proto/go/gitalypb/repository-service.pb.go | 398 +++++++++--------- proto/repository-service.proto | 4 + ruby/proto/gitaly/repository-service_pb.rb | 1 + 5 files changed, 244 insertions(+), 200 deletions(-) create mode 100644 changelogs/unreleased/sh-support-local-fork.yml diff --git a/changelogs/unreleased/sh-support-local-fork.yml b/changelogs/unreleased/sh-support-local-fork.yml new file mode 100644 index 00000000000..90e5f0b3eec --- /dev/null +++ b/changelogs/unreleased/sh-support-local-fork.yml @@ -0,0 +1,5 @@ +--- +title: Speed up cloning of local forks +merge_request: 2915 +author: +type: performance diff --git a/internal/gitaly/service/repository/fork.go b/internal/gitaly/service/repository/fork.go index 7fc450f98c2..44c86457c03 100644 --- a/internal/gitaly/service/repository/fork.go +++ b/internal/gitaly/service/repository/fork.go @@ -58,7 +58,31 @@ func (s *server) CreateFork(ctx context.Context, req *gitalypb.CreateForkRequest flags := []git.Option{ git.Flag{Name: "--bare"}, - git.Flag{Name: "--no-local"}, + } + var args []string + var postSepArgs []string + + if req.GetAllowLocal() && sourceRepository.GetStorageName() == targetRepository.GetStorageName() { + sourceRepositoryFullPath, err := s.locator.GetPath(sourceRepository) + if err != nil { + return nil, err + } + + if _, err := os.Stat(sourceRepositoryFullPath); err != nil { + if !os.IsNotExist(err) { + return nil, status.Errorf(codes.Internal, "CreateFork: check source path: %v", err) + } + } + + flags = append(flags, git.Flag{Name: "--local"}, git.Flag{Name: "--no-hardlinks"}) + args = []string{sourceRepositoryFullPath} + postSepArgs = []string{targetRepositoryFullPath} + } else { + flags = append(flags, git.Flag{Name: "--no-local"}) + postSepArgs = []string{ + fmt.Sprintf("%s:%s", gitalyssh.GitalyInternalURL, sourceRepository.RelativePath), + targetRepositoryFullPath, + } } if objectPool != nil { @@ -80,12 +104,10 @@ func (s *server) CreateFork(ctx context.Context, req *gitalypb.CreateForkRequest cmd, err := git.SafeBareCmd(ctx, git.CmdStream{}, env, nil, git.SubCmd{ - Name: "clone", - Flags: flags, - PostSepArgs: []string{ - fmt.Sprintf("%s:%s", gitalyssh.GitalyInternalURL, sourceRepository.RelativePath), - targetRepositoryFullPath, - }, + Name: "clone", + Flags: flags, + Args: args, + PostSepArgs: postSepArgs, }, git.WithRefTxHook(ctx, req.Repository, s.cfg), ) diff --git a/proto/go/gitalypb/repository-service.pb.go b/proto/go/gitalypb/repository-service.pb.go index d7746e59118..5d5566a20d3 100644 --- a/proto/go/gitalypb/repository-service.pb.go +++ b/proto/go/gitalypb/repository-service.pb.go @@ -1578,10 +1578,14 @@ type CreateForkRequest struct { // Clone using an object pool to reduce object duplication. // This pool repository must reside on the same storage shard // as the target repository. - Pool *ObjectPool `protobuf:"bytes,3,opt,name=pool,proto3" json:"pool,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Pool *ObjectPool `protobuf:"bytes,3,opt,name=pool,proto3" json:"pool,omitempty"` + // Clone using --local and --no-hardlinks flags if possible. This is faster + // than going through the normal git transport, but both + // source and target repositories must reside on the same storage shard. + AllowLocal bool `protobuf:"varint,4,opt,name=allow_local,json=allowLocal,proto3" json:"allow_local,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *CreateForkRequest) Reset() { *m = CreateForkRequest{} } @@ -1630,6 +1634,13 @@ func (m *CreateForkRequest) GetPool() *ObjectPool { return nil } +func (m *CreateForkRequest) GetAllowLocal() bool { + if m != nil { + return m.AllowLocal + } + return false +} + type CreateForkResponse struct { XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` @@ -4020,200 +4031,201 @@ func init() { func init() { proto.RegisterFile("repository-service.proto", fileDescriptor_e9b1768cf174c79b) } var fileDescriptor_e9b1768cf174c79b = []byte{ - // 3075 bytes of a gzipped FileDescriptorProto + // 3092 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x5a, 0x5b, 0x6f, 0xdc, 0xc6, 0xf5, 0xf7, 0x4a, 0xab, 0xbd, 0x1c, 0xad, 0xed, 0xd5, 0x48, 0xb6, 0x56, 0xb4, 0xe4, 0x0b, 0xed, 0x38, 0x8e, 0xe3, 0xc8, 0x89, 0xfd, 0x07, 0xfe, 0x69, 0x8b, 0xa2, 0xd0, 0xae, 0xae, 0xb6, 0x75, 0x09, 0x25, 0x37, 0x88, 0x81, 0x80, 0xe1, 0x72, 0x67, 0xb5, 0xac, 0xb8, 0xe4, 0x7a, 0x38, 0x6b, 0x59, 0x01, 0xfa, 0xd0, 0x02, 0x7d, 0x2b, 0x0a, 0x14, 0x28, 0x9a, 0x3e, 0xe6, 0xb9, 0x9f, 0xa0, - 0x0f, 0x2d, 0x8a, 0xbe, 0xf4, 0x3b, 0x04, 0xfd, 0x06, 0xfd, 0x08, 0x7d, 0x2a, 0xe6, 0x42, 0x0e, - 0xb9, 0x24, 0x37, 0x06, 0x76, 0x11, 0xf4, 0x8d, 0x73, 0x66, 0xe6, 0x9c, 0x33, 0x67, 0xce, 0x99, - 0x99, 0xf3, 0x3b, 0x84, 0x06, 0xc1, 0x03, 0x3f, 0x70, 0xa8, 0x4f, 0x2e, 0x3e, 0x0a, 0x30, 0x79, - 0xe3, 0xd8, 0x78, 0x7d, 0x40, 0x7c, 0xea, 0xa3, 0xd2, 0xa9, 0x43, 0x2d, 0xf7, 0x42, 0x03, 0xd7, - 0xf1, 0xa8, 0xa0, 0x69, 0xb5, 0xa0, 0x67, 0x11, 0xdc, 0x11, 0x2d, 0xfd, 0x18, 0x96, 0x8d, 0x68, - 0xf6, 0xd6, 0x5b, 0x27, 0xa0, 0x81, 0x81, 0x5f, 0x0f, 0x71, 0x40, 0xd1, 0xa7, 0x00, 0x8a, 0x71, - 0xa3, 0x70, 0xbb, 0xf0, 0x60, 0xfe, 0x09, 0x5a, 0x17, 0x1c, 0xd7, 0xd5, 0xa4, 0x66, 0xf1, 0x4f, - 0xff, 0x7c, 0x54, 0x30, 0x62, 0x63, 0xf5, 0x27, 0xd0, 0x48, 0x33, 0x0d, 0x06, 0xbe, 0x17, 0x60, - 0x74, 0x1d, 0x4a, 0x98, 0x53, 0x38, 0xc7, 0x8a, 0x21, 0x5b, 0xfa, 0x09, 0x9f, 0x63, 0xd9, 0x67, - 0x7b, 0x9e, 0x4d, 0x70, 0x1f, 0x7b, 0xd4, 0x72, 0x27, 0xd7, 0xe4, 0x06, 0xac, 0x64, 0x70, 0x15, - 0xaa, 0xe8, 0x04, 0x16, 0x44, 0xe7, 0xf6, 0xd0, 0x9d, 0x5c, 0x16, 0xba, 0x0b, 0x97, 0x6d, 0x82, - 0x2d, 0x8a, 0xcd, 0xb6, 0x43, 0xfb, 0xd6, 0xa0, 0x31, 0xc3, 0x17, 0x58, 0x13, 0xc4, 0x26, 0xa7, - 0xe9, 0x4b, 0x80, 0xe2, 0x32, 0xa5, 0x26, 0xfb, 0xb0, 0xb0, 0xef, 0x74, 0xde, 0x8a, 0x9e, 0xc9, - 0x57, 0xbd, 0x04, 0x28, 0xce, 0x4e, 0x0a, 0xf9, 0x6d, 0x01, 0xae, 0xed, 0x58, 0xa4, 0x6d, 0x9d, - 0xe2, 0x96, 0xef, 0xba, 0xd8, 0xa6, 0x3f, 0xcc, 0x9a, 0xd1, 0x12, 0xcc, 0x0d, 0xc8, 0xd0, 0xc3, - 0x8d, 0x59, 0xde, 0x29, 0x1a, 0x7a, 0x03, 0xae, 0x8f, 0x6a, 0x23, 0x15, 0x3d, 0x86, 0xe5, 0xcf, - 0x89, 0x43, 0x71, 0xcb, 0xef, 0xf7, 0x1d, 0xba, 0x43, 0xac, 0x41, 0x6f, 0x72, 0x9b, 0x68, 0xd0, - 0x48, 0x33, 0x95, 0x02, 0x9f, 0xc1, 0x95, 0x96, 0x8b, 0x2d, 0x6f, 0x38, 0x98, 0x5c, 0xce, 0x02, - 0x5c, 0x8d, 0x78, 0x49, 0xf6, 0x9f, 0xc1, 0x35, 0x35, 0xe5, 0xd8, 0xf9, 0x1a, 0x4f, 0x2e, 0xe5, - 0x11, 0x5c, 0x1f, 0x65, 0x29, 0xe3, 0x0b, 0x41, 0x31, 0x70, 0xbe, 0xc6, 0x9c, 0xdb, 0xac, 0xc1, - 0xbf, 0xf5, 0xd7, 0xb0, 0xb2, 0x31, 0x18, 0xb8, 0x17, 0x3b, 0x0e, 0xb5, 0x28, 0x25, 0x4e, 0x7b, - 0x48, 0xf1, 0xe4, 0x61, 0x8e, 0x34, 0xa8, 0x10, 0xfc, 0xc6, 0x09, 0x1c, 0xdf, 0xe3, 0xfb, 0x5e, - 0x33, 0xa2, 0xb6, 0xbe, 0x0a, 0x5a, 0x96, 0x48, 0x69, 0x91, 0xbf, 0xcf, 0x00, 0xda, 0xc6, 0xd4, - 0xee, 0x19, 0xb8, 0xef, 0xd3, 0xc9, 0xed, 0xc1, 0x4e, 0x15, 0xc2, 0x59, 0x71, 0x45, 0xaa, 0x86, - 0x6c, 0x31, 0xd7, 0xeb, 0xfa, 0xc4, 0x8e, 0x5c, 0x8f, 0x37, 0xd0, 0x32, 0x94, 0x3d, 0xdf, 0xa4, - 0xd6, 0x69, 0xd0, 0x28, 0x8a, 0x43, 0xc8, 0xf3, 0x4f, 0xac, 0xd3, 0x00, 0x35, 0xa0, 0x4c, 0x9d, - 0x3e, 0xf6, 0x87, 0xb4, 0x31, 0x77, 0xbb, 0xf0, 0x60, 0xce, 0x08, 0x9b, 0x6c, 0x4a, 0x10, 0xf4, - 0xcc, 0x33, 0x7c, 0xd1, 0x28, 0x09, 0x09, 0x41, 0xd0, 0x7b, 0x8e, 0x2f, 0xd0, 0x2d, 0x98, 0x3f, - 0xf3, 0xfc, 0x73, 0xcf, 0xec, 0xf9, 0xec, 0x50, 0x2b, 0xf3, 0x4e, 0xe0, 0xa4, 0x5d, 0x46, 0x41, - 0x2b, 0x50, 0xf1, 0x7c, 0x53, 0x04, 0x40, 0x95, 0x4b, 0x2b, 0x7b, 0xfe, 0x11, 0x6b, 0xa2, 0xa7, - 0x70, 0x59, 0xe8, 0x69, 0x0e, 0x2c, 0x62, 0xf5, 0x83, 0x06, 0xf0, 0x25, 0x5f, 0x51, 0x4b, 0xe6, - 0xd6, 0xa9, 0x89, 0x41, 0x47, 0x7c, 0xcc, 0xb3, 0x62, 0xa5, 0x52, 0xaf, 0xea, 0xd7, 0x60, 0x31, - 0x61, 0x40, 0x15, 0x3a, 0x2d, 0x1e, 0x7a, 0xca, 0x5a, 0x53, 0x09, 0x9d, 0x34, 0x53, 0x29, 0xf0, - 0xdf, 0x33, 0xb0, 0xb0, 0x83, 0xe9, 0x06, 0xb1, 0x7b, 0xce, 0x9b, 0x29, 0x6c, 0xe4, 0x0d, 0xa8, - 0xda, 0x3c, 0x42, 0x4d, 0xa7, 0x23, 0xf7, 0xb2, 0x22, 0x08, 0x7b, 0x1d, 0xb6, 0xcb, 0x03, 0x82, - 0xbb, 0xce, 0x5b, 0xbe, 0x9d, 0x55, 0x43, 0xb6, 0xd0, 0xa7, 0x50, 0xea, 0xfa, 0xa4, 0x6f, 0x51, - 0xbe, 0x9d, 0x57, 0x9e, 0xdc, 0x0e, 0x45, 0xa5, 0x34, 0x5b, 0xdf, 0xe6, 0xe3, 0x0c, 0x39, 0x9e, - 0x45, 0xcb, 0xc0, 0xa2, 0x3d, 0xbe, 0xdb, 0x35, 0x83, 0x7f, 0x33, 0x27, 0xc0, 0x6f, 0x6d, 0x77, - 0xd8, 0xc1, 0x8d, 0xd2, 0xed, 0xd9, 0x07, 0x35, 0x23, 0x6c, 0xa2, 0x35, 0x00, 0xec, 0x3a, 0x1d, - 0xb6, 0x5d, 0xb4, 0xc7, 0xb7, 0xba, 0x62, 0x54, 0x39, 0xe5, 0x88, 0x4d, 0x7c, 0x08, 0x0b, 0x8e, - 0xc7, 0x47, 0x9a, 0x6e, 0x37, 0x30, 0xdb, 0xae, 0xdf, 0x0e, 0x1a, 0x15, 0x3e, 0xea, 0xaa, 0xec, - 0x78, 0xd1, 0x0d, 0x9a, 0x8c, 0xac, 0x3f, 0x85, 0x92, 0x50, 0x05, 0x95, 0x61, 0xf6, 0xd5, 0xde, - 0x51, 0xfd, 0x12, 0xfb, 0x38, 0xd9, 0x30, 0xea, 0x05, 0x04, 0x50, 0x3a, 0xd9, 0x30, 0xcc, 0x9d, - 0x57, 0xf5, 0x19, 0x34, 0x0f, 0x65, 0xf6, 0xdd, 0x7c, 0xf5, 0xa4, 0x3e, 0xab, 0x3f, 0x00, 0x14, - 0x5f, 0x91, 0x8a, 0xf8, 0x8e, 0x45, 0x2d, 0x6e, 0xe6, 0x9a, 0xc1, 0xbf, 0x99, 0x1f, 0xec, 0x5a, - 0xc1, 0x0b, 0xdf, 0xb6, 0xdc, 0x26, 0xb1, 0x3c, 0xbb, 0x37, 0x85, 0x78, 0xd7, 0x3f, 0x86, 0x46, - 0x9a, 0xa9, 0x54, 0x62, 0x09, 0xe6, 0xde, 0x58, 0xee, 0x10, 0xcb, 0x5b, 0x5d, 0x34, 0xf4, 0xef, - 0x0a, 0xd0, 0xe0, 0x6e, 0x7a, 0xec, 0x0f, 0x89, 0x8d, 0xc5, 0xac, 0xc9, 0x9d, 0xe4, 0x67, 0xb0, - 0x10, 0x70, 0x86, 0x66, 0x8c, 0xc1, 0x4c, 0x1e, 0x03, 0xa3, 0x2e, 0x06, 0x1b, 0x89, 0x6b, 0x4b, - 0x32, 0x68, 0x73, 0x95, 0xb8, 0x3f, 0xd5, 0x8c, 0x5a, 0x10, 0x53, 0x93, 0xed, 0x36, 0xb5, 0xc8, - 0x29, 0xa6, 0x26, 0xc1, 0x5d, 0xee, 0x59, 0x35, 0xa3, 0x2a, 0x28, 0x06, 0xee, 0xea, 0x4f, 0x61, - 0x25, 0x63, 0x69, 0xea, 0x95, 0x43, 0x70, 0x30, 0x74, 0x69, 0xf8, 0xca, 0x11, 0x2d, 0x7d, 0x07, - 0xe6, 0xb7, 0x83, 0x69, 0x5c, 0xf1, 0xf7, 0xa0, 0x26, 0x18, 0x29, 0xfb, 0x63, 0x42, 0x7c, 0x22, - 0xbd, 0x40, 0x34, 0xf4, 0xbf, 0x14, 0xe0, 0x2a, 0xbf, 0xf5, 0x0c, 0xdc, 0x9d, 0xdc, 0xec, 0x75, - 0x98, 0x65, 0x96, 0x10, 0x47, 0x3d, 0xfb, 0x4c, 0xdc, 0x00, 0xb3, 0xc9, 0x1b, 0x00, 0xdd, 0x81, - 0x9a, 0xef, 0x76, 0xcc, 0xa8, 0x5f, 0x18, 0x70, 0xde, 0x77, 0x3b, 0x46, 0x38, 0x24, 0x3a, 0x9d, - 0xe7, 0x62, 0xa7, 0xf3, 0xb3, 0x62, 0xa5, 0x54, 0x2f, 0xeb, 0x0d, 0xa8, 0x2b, 0xcd, 0xc5, 0x22, - 0x9f, 0x15, 0x2b, 0x85, 0xfa, 0x8c, 0xee, 0xc1, 0xd2, 0xb6, 0xe3, 0x75, 0xf6, 0x31, 0x39, 0xc5, - 0x4d, 0x2b, 0x98, 0xc2, 0xa1, 0xb3, 0x0a, 0xd5, 0x50, 0xcd, 0xa0, 0x31, 0xc3, 0x63, 0x5e, 0x11, - 0xf4, 0x0f, 0xe1, 0xda, 0x88, 0x3c, 0x15, 0x78, 0x6d, 0x2b, 0x10, 0x2e, 0x5f, 0x35, 0xf8, 0xb7, - 0xfe, 0xd7, 0x02, 0x2c, 0x88, 0xc3, 0x72, 0xdb, 0x27, 0x67, 0xff, 0x03, 0xae, 0xfe, 0x08, 0x8a, - 0x03, 0xdf, 0x77, 0xf9, 0xf6, 0xc4, 0xe6, 0x1c, 0xb6, 0x7f, 0x81, 0x6d, 0x7a, 0xe4, 0xfb, 0x6e, - 0xb3, 0xf8, 0x2d, 0x13, 0xca, 0x47, 0xb1, 0x97, 0x63, 0x5c, 0xfb, 0xe8, 0xa1, 0xbc, 0xb2, 0x17, - 0x18, 0x98, 0x2d, 0x70, 0xcf, 0x3b, 0x22, 0xfe, 0x29, 0xc1, 0x41, 0x30, 0x95, 0xb3, 0x9e, 0x70, - 0xa6, 0xb1, 0xb3, 0x5e, 0x10, 0xf6, 0x3a, 0xfa, 0x4f, 0x41, 0xcb, 0x92, 0x29, 0x4d, 0x7f, 0x0b, - 0xe6, 0x1d, 0xcf, 0x1c, 0x48, 0xb2, 0x0c, 0x32, 0x70, 0xa2, 0x81, 0x42, 0xe5, 0xe3, 0xd7, 0x43, - 0x2b, 0xe8, 0x4d, 0x59, 0xe5, 0x80, 0x33, 0x8d, 0xa9, 0x2c, 0x08, 0xa1, 0xca, 0x69, 0x99, 0xef, - 0xaa, 0xb2, 0x0b, 0x37, 0x47, 0xaf, 0xd9, 0x6d, 0xe2, 0xf7, 0x5f, 0x1a, 0x2f, 0xa6, 0x12, 0xba, - 0x43, 0xe2, 0x4a, 0x8d, 0xd9, 0xa7, 0x7e, 0x07, 0x6e, 0xe5, 0x4a, 0x93, 0xdb, 0x7e, 0x08, 0x8b, - 0x62, 0x48, 0x73, 0xe8, 0x75, 0xdc, 0x29, 0xbc, 0x5a, 0x1f, 0xc2, 0x52, 0x92, 0xe1, 0x98, 0x1b, - 0xec, 0x77, 0x33, 0x50, 0x3f, 0xc6, 0xb4, 0xe5, 0x7b, 0x5d, 0xe7, 0x74, 0x72, 0x03, 0x7c, 0x0a, - 0x65, 0xec, 0x51, 0xe2, 0x60, 0x11, 0xe0, 0xf3, 0x4f, 0x6e, 0x86, 0xd3, 0x46, 0x85, 0xac, 0x6f, - 0x79, 0x94, 0x5c, 0x18, 0xe1, 0x70, 0xed, 0x37, 0x05, 0x98, 0xe3, 0x24, 0x66, 0x44, 0xf6, 0xfe, - 0x13, 0xe1, 0xce, 0x3e, 0xd1, 0x1a, 0x54, 0xf9, 0x45, 0x67, 0x06, 0x94, 0x08, 0xe3, 0xee, 0x5e, - 0x32, 0x2a, 0x9c, 0x74, 0x4c, 0x09, 0xba, 0x03, 0xf3, 0xa2, 0xdb, 0xf1, 0xe8, 0xd3, 0x27, 0x3c, - 0x04, 0xe7, 0x76, 0x2f, 0x19, 0xc0, 0x89, 0x7b, 0x8c, 0x86, 0x6e, 0x81, 0x68, 0x99, 0x6d, 0x16, - 0xa4, 0xfc, 0x35, 0xba, 0x7b, 0xc9, 0x10, 0x5c, 0x9b, 0x2c, 0x3a, 0xcb, 0xf2, 0x62, 0xd5, 0x17, - 0x61, 0x21, 0xa6, 0xaa, 0xdc, 0x22, 0x1b, 0x16, 0x37, 0xb1, 0x8b, 0x59, 0x5a, 0x33, 0x1d, 0x3b, - 0x21, 0x28, 0x9e, 0xe1, 0x0b, 0x61, 0xa4, 0xaa, 0xc1, 0xbf, 0xf5, 0xeb, 0xb0, 0x94, 0x14, 0x22, - 0x85, 0x3b, 0x2c, 0xb9, 0x0e, 0xa8, 0x4f, 0x70, 0x6b, 0x18, 0x50, 0xbf, 0xbf, 0xeb, 0xfb, 0x67, - 0xc1, 0x54, 0x54, 0xe0, 0xde, 0x30, 0x13, 0xf3, 0x86, 0x55, 0xd0, 0xb2, 0x44, 0x49, 0x45, 0x4e, - 0xa0, 0xd1, 0xb4, 0xec, 0xb3, 0xe1, 0x60, 0x9a, 0x7a, 0xe8, 0x8f, 0x61, 0x25, 0x83, 0xeb, 0x18, - 0x97, 0x7d, 0x0d, 0x77, 0xb2, 0x42, 0x6a, 0x4a, 0xd1, 0x93, 0x69, 0x97, 0x7b, 0xa0, 0x8f, 0x13, - 0x29, 0xed, 0x73, 0x00, 0x88, 0xdd, 0x60, 0x2f, 0x1c, 0x1b, 0x7b, 0x53, 0xb8, 0x2f, 0xf5, 0x16, - 0x2c, 0x26, 0xf8, 0x49, 0x9b, 0x3c, 0x02, 0xe4, 0x0a, 0x92, 0x19, 0xf4, 0x7c, 0x42, 0x4d, 0xcf, - 0xea, 0x87, 0xb7, 0x63, 0x5d, 0xf6, 0x1c, 0xb3, 0x8e, 0x03, 0xab, 0xcf, 0x37, 0x6d, 0x07, 0xd3, - 0x3d, 0xaf, 0xeb, 0x6f, 0x4c, 0x2f, 0x27, 0xd5, 0x7f, 0x02, 0x2b, 0x19, 0x5c, 0xa5, 0x82, 0x37, - 0x01, 0x54, 0x32, 0x2a, 0xb7, 0x2e, 0x46, 0x61, 0x2a, 0xb5, 0x2c, 0xd7, 0x1e, 0xba, 0x16, 0xc5, - 0xad, 0x1e, 0xb6, 0xcf, 0x82, 0x61, 0x7f, 0x72, 0x95, 0xfe, 0x1f, 0x56, 0x32, 0xb8, 0x4a, 0x95, - 0x34, 0xa8, 0xd8, 0x92, 0x26, 0x2d, 0x15, 0xb5, 0xd9, 0xb6, 0xed, 0x60, 0x7a, 0xec, 0x59, 0x83, - 0xa0, 0xe7, 0x4f, 0x0e, 0xd6, 0xe8, 0x1f, 0xc0, 0x62, 0x82, 0xdf, 0x18, 0x57, 0xfe, 0xa6, 0x00, - 0x77, 0xb3, 0x1c, 0x6b, 0x6a, 0xca, 0xb0, 0xb4, 0xb8, 0x47, 0xe9, 0xc0, 0x54, 0xd7, 0x52, 0x99, - 0xb5, 0x5f, 0x12, 0x97, 0x5d, 0xb2, 0xbc, 0xcb, 0x1a, 0xd2, 0x9e, 0xcc, 0xf4, 0xf8, 0xd8, 0x8d, - 0x21, 0xed, 0xe9, 0xf7, 0xe1, 0xde, 0x78, 0xc5, 0xa4, 0xcf, 0xff, 0xb1, 0x00, 0x4b, 0x3b, 0x98, - 0x1a, 0xd6, 0x79, 0xab, 0x67, 0x79, 0xa7, 0xd3, 0xc0, 0x3b, 0xee, 0xc2, 0xe5, 0x2e, 0xf1, 0xfb, - 0x66, 0x02, 0xf4, 0xa8, 0x1a, 0x35, 0x46, 0x8c, 0xde, 0xb4, 0xb7, 0x60, 0x9e, 0xfa, 0x66, 0xe2, - 0x55, 0x5c, 0x35, 0x80, 0xfa, 0xe1, 0x00, 0xfd, 0x6f, 0x45, 0xb8, 0x36, 0xa2, 0x98, 0xdc, 0x88, - 0x5d, 0x98, 0x27, 0xd6, 0xb9, 0x69, 0x0b, 0x72, 0xa3, 0xc0, 0xef, 0xa9, 0xf7, 0x63, 0xb9, 0x6c, - 0x7a, 0xce, 0x7a, 0x44, 0x32, 0x80, 0x44, 0xbd, 0xda, 0x77, 0xb3, 0x50, 0x8d, 0x7a, 0xd0, 0x32, - 0x94, 0x59, 0x2e, 0xca, 0x9e, 0x2c, 0xc2, 0xc5, 0x4a, 0xac, 0xb9, 0xd7, 0x89, 0xb0, 0xa2, 0x19, - 0x85, 0x15, 0xa1, 0x35, 0xa8, 0x78, 0xf8, 0x5c, 0x64, 0xb8, 0x5c, 0xf9, 0xe6, 0x4c, 0xa3, 0x60, - 0x94, 0x3d, 0x7c, 0xce, 0x73, 0xdc, 0x35, 0xa8, 0xb0, 0x57, 0x3d, 0xef, 0x2e, 0xaa, 0x6e, 0xdf, - 0xed, 0xf0, 0xee, 0x43, 0xa8, 0xfa, 0x03, 0x4c, 0x2c, 0xca, 0xd6, 0x3e, 0xc7, 0x93, 0xf1, 0x4f, - 0xde, 0x71, 0x01, 0xeb, 0x87, 0xe1, 0x44, 0x43, 0xf1, 0x60, 0x36, 0x67, 0x36, 0x51, 0x4c, 0x05, - 0xfa, 0x52, 0x23, 0xd6, 0x79, 0x34, 0x9e, 0xf9, 0x12, 0x53, 0xaa, 0xef, 0x77, 0x30, 0xcf, 0xca, - 0xe7, 0xb8, 0x42, 0xfb, 0x7e, 0x07, 0x73, 0xf4, 0x05, 0x9f, 0x8b, 0xae, 0x8a, 0xe8, 0xf2, 0xf0, - 0x39, 0xef, 0xba, 0x07, 0x57, 0xc2, 0x95, 0x9a, 0xed, 0x0b, 0x76, 0x22, 0x54, 0x45, 0x16, 0x28, - 0xd7, 0xda, 0x64, 0x34, 0x36, 0x2a, 0x5c, 0xb0, 0x1c, 0x05, 0x62, 0x94, 0x5c, 0x32, 0x1f, 0xa5, - 0x3b, 0x50, 0x55, 0xea, 0xcc, 0x43, 0xf9, 0xe5, 0xc1, 0xf3, 0x83, 0xc3, 0xcf, 0x0f, 0xea, 0x97, - 0x50, 0x15, 0xe6, 0x36, 0x36, 0x37, 0xb7, 0x36, 0x45, 0x5e, 0xdf, 0x3a, 0x3c, 0xda, 0xdb, 0xda, - 0x14, 0x79, 0xfd, 0xe6, 0xd6, 0x8b, 0xad, 0x93, 0xad, 0xcd, 0xfa, 0x2c, 0xaa, 0x41, 0x65, 0xff, - 0x70, 0x73, 0x6f, 0x9b, 0x75, 0x15, 0x59, 0x97, 0xb1, 0x75, 0xb0, 0xb1, 0xbf, 0xb5, 0x59, 0x9f, - 0x43, 0x75, 0xa8, 0x9d, 0x7c, 0x71, 0xb4, 0x65, 0xb6, 0x76, 0x37, 0x0e, 0x76, 0xb6, 0x36, 0xeb, - 0x25, 0xfd, 0x0f, 0x05, 0x68, 0x1c, 0x63, 0x8b, 0xd8, 0xbd, 0x6d, 0xc7, 0xc5, 0x41, 0xf3, 0x82, - 0x9d, 0xa6, 0x93, 0x3b, 0xf7, 0x12, 0xcc, 0xbd, 0x1e, 0x62, 0x99, 0x5c, 0x54, 0x0d, 0xd1, 0x08, - 0x53, 0xbe, 0x59, 0x95, 0xf2, 0x5d, 0x87, 0x52, 0xd7, 0x71, 0x29, 0x26, 0x62, 0xfb, 0x0d, 0xd9, - 0xd2, 0x3f, 0x81, 0x95, 0x0c, 0xad, 0x54, 0x76, 0xda, 0x65, 0x64, 0xee, 0xd3, 0x35, 0x43, 0x34, - 0xf4, 0x3f, 0x17, 0xe0, 0x46, 0x62, 0x4e, 0xcb, 0xf7, 0x28, 0xf6, 0xe8, 0x0f, 0xb7, 0x98, 0x0f, - 0xa0, 0x6e, 0xf7, 0x86, 0xde, 0x19, 0x66, 0x79, 0xaa, 0xd0, 0x55, 0x22, 0x82, 0x57, 0x25, 0x3d, - 0x3a, 0x4f, 0x2e, 0x60, 0x35, 0x5b, 0x57, 0xb9, 0xc4, 0x06, 0x94, 0xfb, 0x16, 0xb5, 0x7b, 0xd1, - 0x22, 0xc3, 0x26, 0x5a, 0x03, 0xe0, 0x9f, 0x66, 0xec, 0xf6, 0xae, 0x72, 0xca, 0xa6, 0x45, 0x2d, - 0x74, 0x1b, 0x6a, 0xd8, 0xeb, 0x98, 0x7e, 0xd7, 0xe4, 0x34, 0x89, 0x54, 0x02, 0xf6, 0x3a, 0x87, - 0xdd, 0x7d, 0x46, 0xd1, 0x7f, 0x5f, 0x80, 0x92, 0xc0, 0xf9, 0xc2, 0x77, 0x7c, 0x21, 0x7a, 0xc7, - 0xb3, 0x18, 0xe6, 0xd7, 0xac, 0x58, 0x29, 0xff, 0x46, 0x3f, 0x86, 0x95, 0xe8, 0x00, 0xf5, 0x89, - 0xf3, 0x35, 0x77, 0x4b, 0xb3, 0x87, 0xad, 0x0e, 0x26, 0xf2, 0x44, 0x5a, 0x0e, 0x0f, 0xd4, 0xa8, - 0x7f, 0x97, 0x77, 0xa3, 0xf7, 0xe0, 0x4a, 0xdf, 0x21, 0xc4, 0x27, 0x26, 0xc1, 0xdd, 0xbe, 0x35, - 0x08, 0x1a, 0x45, 0xfe, 0x14, 0xbc, 0x2c, 0xa8, 0x86, 0x20, 0xea, 0x5f, 0xc0, 0xda, 0x0e, 0xa6, - 0x22, 0x8b, 0xdc, 0x74, 0x08, 0xb6, 0xa7, 0x87, 0x6d, 0xff, 0x1f, 0xdc, 0xcc, 0x63, 0x3d, 0x06, - 0xe3, 0xfe, 0xb6, 0x00, 0x4b, 0x2d, 0xd7, 0xf7, 0x30, 0xbb, 0x0d, 0x58, 0x5e, 0x3b, 0xb9, 0x17, - 0xdd, 0x97, 0xa9, 0xf3, 0x4c, 0x5e, 0xea, 0x2c, 0x92, 0x66, 0x74, 0x3f, 0x02, 0x9f, 0x67, 0x33, - 0xf1, 0x5b, 0xd9, 0xab, 0x2f, 0xc3, 0xb5, 0x11, 0x0d, 0xa5, 0x6f, 0xfd, 0xa3, 0x00, 0xab, 0x89, - 0x9e, 0x3d, 0x8f, 0x62, 0xe2, 0x59, 0x3f, 0xe0, 0x1a, 0x32, 0x71, 0x86, 0xd9, 0x77, 0xc7, 0x19, - 0xf4, 0x5b, 0xb0, 0x96, 0xb3, 0x04, 0x05, 0x4d, 0x33, 0x7b, 0xbc, 0x99, 0x36, 0x34, 0x9d, 0x66, - 0x2a, 0x05, 0xbe, 0x65, 0x02, 0x3d, 0x7e, 0x0c, 0x4d, 0x4d, 0x20, 0xbf, 0x8f, 0xb0, 0x6b, 0x51, - 0xe7, 0x8d, 0x44, 0x81, 0xe5, 0x1b, 0x20, 0x24, 0xb2, 0x2b, 0x41, 0x68, 0x35, 0x2a, 0x59, 0x6a, - 0xf5, 0xeb, 0x02, 0x4b, 0x65, 0x06, 0xae, 0x63, 0x4f, 0x17, 0xa5, 0x47, 0x0f, 0xa1, 0x24, 0x36, - 0x65, 0x0c, 0x3c, 0x24, 0x47, 0xe8, 0x6b, 0x70, 0x23, 0x53, 0x07, 0xa9, 0xe3, 0x4b, 0x58, 0x39, - 0x1c, 0x50, 0xa7, 0xcf, 0x63, 0x6e, 0x7a, 0x9b, 0xb5, 0x0a, 0x5a, 0x16, 0x5b, 0x21, 0xf4, 0xc9, - 0xbf, 0x6e, 0xf2, 0x72, 0x6c, 0x58, 0xd3, 0x12, 0x75, 0x6c, 0xf4, 0x25, 0xd4, 0x47, 0x4b, 0xc9, - 0xe8, 0x56, 0x5a, 0x5a, 0xa2, 0x72, 0xad, 0xdd, 0xce, 0x1f, 0x20, 0x57, 0x58, 0xfa, 0xcf, 0x37, - 0x0f, 0x66, 0x2a, 0x33, 0xe8, 0xab, 0xb0, 0x04, 0x1c, 0xab, 0x0f, 0xa3, 0xf8, 0xf4, 0xcc, 0x82, - 0xb4, 0x76, 0x67, 0xcc, 0x88, 0x84, 0x84, 0x02, 0x7a, 0x0e, 0xa0, 0x0a, 0xbe, 0x68, 0x25, 0x39, - 0x31, 0x56, 0x78, 0xd6, 0xb4, 0xac, 0xae, 0x34, 0x33, 0x55, 0xd8, 0x55, 0xcc, 0x52, 0xb5, 0x63, - 0xc5, 0x2c, 0xa3, 0x0e, 0x1c, 0x32, 0xfb, 0x1c, 0xae, 0x24, 0x0b, 0xb0, 0x68, 0x2d, 0x7a, 0xaa, - 0x65, 0x95, 0x89, 0xb5, 0x9b, 0x79, 0xdd, 0x23, 0x8c, 0xbf, 0x94, 0xd0, 0x6d, 0xac, 0xd4, 0xaa, - 0xf6, 0x2c, 0xa7, 0xb2, 0xab, 0xf6, 0x2c, 0xb7, 0x4a, 0x1b, 0xd3, 0x3b, 0x59, 0xfb, 0x54, 0x7a, - 0x67, 0x96, 0x59, 0x95, 0xde, 0xd9, 0x25, 0xd3, 0xc8, 0x19, 0x6c, 0x40, 0xe9, 0x9a, 0x25, 0x8a, - 0xf6, 0x3a, 0xb7, 0x84, 0xaa, 0xe9, 0xe3, 0x86, 0x8c, 0x68, 0x7f, 0x00, 0xf3, 0xb1, 0xc2, 0x1d, - 0x8a, 0x36, 0x2a, 0x5d, 0x0e, 0xd5, 0x6e, 0x64, 0xf6, 0xa5, 0x8d, 0x3d, 0x9a, 0x0f, 0x29, 0x63, - 0xe7, 0xd4, 0x02, 0x95, 0xb1, 0x73, 0xeb, 0x7a, 0x21, 0xfb, 0x7d, 0x00, 0x55, 0x72, 0x52, 0x1e, - 0x97, 0x2a, 0xac, 0x29, 0x8f, 0x4b, 0x57, 0xa8, 0x42, 0x03, 0x7f, 0xcc, 0xb5, 0x1d, 0x2d, 0x21, - 0x29, 0x6d, 0x73, 0x2a, 0x56, 0x4a, 0xdb, 0xbc, 0xea, 0x53, 0x3c, 0x9c, 0x53, 0x35, 0x19, 0x15, - 0xce, 0x79, 0x95, 0x28, 0x15, 0xce, 0xb9, 0x05, 0x9d, 0xc8, 0x1e, 0x3f, 0x82, 0xe2, 0x76, 0x60, - 0x9f, 0xa1, 0xc5, 0x68, 0x8a, 0x2a, 0xe7, 0x68, 0x4b, 0x49, 0xe2, 0xc8, 0xd4, 0x2d, 0xa8, 0x84, - 0x15, 0x0d, 0xb4, 0x9c, 0xf0, 0x76, 0x55, 0x9d, 0xd1, 0x1a, 0xe9, 0x8e, 0x11, 0x36, 0x27, 0x70, - 0x39, 0x51, 0x8e, 0x40, 0xab, 0x91, 0xd4, 0x8c, 0xaa, 0x88, 0xb6, 0x96, 0xd3, 0x3b, 0x62, 0xb9, - 0xe7, 0x00, 0x0a, 0xf8, 0x57, 0xfb, 0x9c, 0x2a, 0x65, 0xa8, 0x7d, 0xce, 0xa8, 0x13, 0x84, 0x2a, - 0xda, 0x80, 0xd2, 0xd8, 0xbd, 0x0a, 0xa4, 0xdc, 0x5a, 0x82, 0x0a, 0xa4, 0x7c, 0xe8, 0x3f, 0x1e, - 0xad, 0x69, 0xb4, 0x3d, 0x2e, 0x24, 0x07, 0xfd, 0x8f, 0x0b, 0xc9, 0x03, 0xeb, 0x23, 0x21, 0x24, - 0x5d, 0x4f, 0x97, 0x28, 0x39, 0xba, 0x9f, 0x17, 0x43, 0x49, 0xd0, 0x5e, 0x7b, 0xff, 0x7b, 0xc7, - 0x8d, 0x58, 0xef, 0x18, 0x6a, 0x71, 0x94, 0x1c, 0xdd, 0x48, 0x32, 0x48, 0xc0, 0x89, 0xda, 0x6a, - 0x76, 0x67, 0x2a, 0xf0, 0x7e, 0x09, 0x5a, 0x3e, 0x50, 0x88, 0x3e, 0x18, 0xa7, 0x63, 0x52, 0xe0, - 0xc3, 0x77, 0x19, 0x9a, 0x5c, 0xd1, 0x83, 0x02, 0xda, 0x85, 0x6a, 0x04, 0x5e, 0xa3, 0x46, 0x1e, - 0xf4, 0xae, 0xad, 0x64, 0xf4, 0x8c, 0x58, 0xe7, 0x33, 0xa8, 0xc5, 0xc1, 0x68, 0x65, 0x9d, 0x0c, - 0x1c, 0x5c, 0x59, 0x27, 0x13, 0xbf, 0x8e, 0x1f, 0xc9, 0x0a, 0xce, 0x8c, 0x1d, 0xc9, 0x29, 0xcc, - 0x34, 0x76, 0x24, 0xa7, 0xf1, 0xcf, 0xc8, 0x69, 0xda, 0xfc, 0x97, 0x88, 0x24, 0x06, 0x89, 0xe2, - 0xff, 0x24, 0x64, 0x82, 0x9e, 0xea, 0x14, 0xca, 0x05, 0x30, 0x63, 0xfb, 0xf9, 0x15, 0x2c, 0xa4, - 0x40, 0x45, 0x25, 0x23, 0x0f, 0xc5, 0x54, 0x32, 0x72, 0x11, 0xc9, 0x68, 0x15, 0x4d, 0x28, 0xcb, - 0x1f, 0x99, 0xd0, 0xf5, 0x68, 0x56, 0xe2, 0x2f, 0x29, 0x6d, 0x39, 0x45, 0x1f, 0xb1, 0xec, 0x11, - 0xcc, 0xc7, 0x10, 0x47, 0x14, 0xbf, 0x23, 0x46, 0x90, 0x44, 0x65, 0xd9, 0x0c, 0x88, 0x32, 0xb6, - 0xee, 0x5f, 0xb1, 0x54, 0x69, 0x0c, 0xfe, 0x87, 0x3e, 0x1c, 0xe7, 0x9f, 0xa3, 0x42, 0x1f, 0xbd, - 0xdb, 0xe0, 0x91, 0x55, 0xfd, 0x1c, 0x2e, 0x27, 0xb0, 0x2c, 0x75, 0x02, 0x67, 0x01, 0x8e, 0xea, - 0x04, 0xce, 0x04, 0xc0, 0x62, 0x6b, 0x3b, 0x83, 0xa5, 0x2c, 0x88, 0x01, 0xdd, 0x55, 0x51, 0x91, - 0x0b, 0x96, 0x68, 0xf7, 0xc6, 0x0f, 0x4a, 0x09, 0x6b, 0xc3, 0x42, 0x0a, 0xaf, 0x51, 0x0e, 0x94, - 0x07, 0x30, 0x29, 0x07, 0xca, 0x05, 0x7b, 0x62, 0x32, 0x30, 0xa0, 0x74, 0xd5, 0x06, 0xc5, 0x1e, - 0xcf, 0x39, 0xc5, 0x23, 0x75, 0x44, 0x8f, 0x29, 0xfa, 0xa8, 0xc3, 0xa5, 0x0d, 0x0b, 0xa9, 0x42, - 0x8d, 0x5a, 0x4a, 0x5e, 0x65, 0x48, 0x2d, 0x25, 0xb7, 0xca, 0x13, 0x5b, 0x8a, 0x0f, 0xd7, 0xb3, - 0x41, 0x09, 0xf4, 0x5e, 0x6c, 0x7b, 0xf3, 0xf1, 0x10, 0xed, 0xfe, 0xf7, 0x0d, 0x1b, 0x09, 0xbf, - 0x13, 0xb8, 0x9c, 0xc8, 0xa7, 0x95, 0x93, 0x65, 0xa1, 0x1c, 0xca, 0xc9, 0xb2, 0x11, 0x86, 0xd0, - 0x75, 0xdd, 0x11, 0x08, 0x22, 0xcc, 0xd2, 0xd1, 0xbd, 0xcc, 0xf9, 0x23, 0x38, 0x84, 0xf6, 0xde, - 0xf7, 0x8c, 0x4a, 0xbf, 0x4d, 0x47, 0xb3, 0xf3, 0x78, 0xf2, 0x96, 0x09, 0x06, 0xc4, 0x93, 0xb7, - 0x9c, 0xc4, 0x3e, 0xc1, 0x3e, 0x99, 0x66, 0xc7, 0xd9, 0x67, 0xa6, 0xfe, 0x71, 0xf6, 0x39, 0x19, - 0x7a, 0xc8, 0xbe, 0x0b, 0x8b, 0x19, 0x49, 0x32, 0x8a, 0xf9, 0x66, 0x5e, 0x16, 0xaf, 0xdd, 0x1d, - 0x3b, 0x26, 0xfd, 0x5a, 0x4a, 0xa7, 0xc5, 0x2a, 0x4a, 0x72, 0x33, 0x71, 0x15, 0x25, 0xf9, 0x59, - 0x75, 0x28, 0xa4, 0xf9, 0xf1, 0x2b, 0x36, 0xd8, 0xb5, 0xda, 0xeb, 0xb6, 0xdf, 0x7f, 0x2c, 0x3e, - 0x3f, 0xf2, 0xc9, 0xe9, 0x63, 0xc1, 0xe2, 0x31, 0xff, 0x1b, 0xfc, 0xf1, 0xa9, 0x2f, 0xdb, 0x83, - 0x76, 0xbb, 0xc4, 0x49, 0x4f, 0xff, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x75, 0x86, 0x42, 0x1a, 0x5e, - 0x2e, 0x00, 0x00, + 0x2f, 0x45, 0xd1, 0x97, 0x7e, 0x87, 0xa0, 0xe8, 0x17, 0xe8, 0x47, 0xe8, 0x53, 0x31, 0x17, 0x72, + 0xc8, 0x25, 0xb9, 0x31, 0xb0, 0x8b, 0xa0, 0x6f, 0x9c, 0x33, 0x33, 0xe7, 0x9c, 0x39, 0x73, 0xce, + 0xcc, 0x9c, 0xdf, 0x21, 0x34, 0x08, 0x1e, 0xf8, 0x81, 0x43, 0x7d, 0x72, 0xf1, 0x51, 0x80, 0xc9, + 0x1b, 0xc7, 0xc6, 0xeb, 0x03, 0xe2, 0x53, 0x1f, 0x95, 0x4e, 0x1d, 0x6a, 0xb9, 0x17, 0x1a, 0xb8, + 0x8e, 0x47, 0x05, 0x4d, 0xab, 0x05, 0x3d, 0x8b, 0xe0, 0x8e, 0x68, 0xe9, 0xc7, 0xb0, 0x6c, 0x44, + 0xb3, 0xb7, 0xde, 0x3a, 0x01, 0x0d, 0x0c, 0xfc, 0x7a, 0x88, 0x03, 0x8a, 0x3e, 0x05, 0x50, 0x8c, + 0x1b, 0x85, 0xdb, 0x85, 0x07, 0xf3, 0x4f, 0xd0, 0xba, 0xe0, 0xb8, 0xae, 0x26, 0x35, 0x8b, 0x7f, + 0xfa, 0xc7, 0xa3, 0x82, 0x11, 0x1b, 0xab, 0x3f, 0x81, 0x46, 0x9a, 0x69, 0x30, 0xf0, 0xbd, 0x00, + 0xa3, 0xeb, 0x50, 0xc2, 0x9c, 0xc2, 0x39, 0x56, 0x0c, 0xd9, 0xd2, 0x4f, 0xf8, 0x1c, 0xcb, 0x3e, + 0xdb, 0xf3, 0x6c, 0x82, 0xfb, 0xd8, 0xa3, 0x96, 0x3b, 0xb9, 0x26, 0x37, 0x60, 0x25, 0x83, 0xab, + 0x50, 0x45, 0x27, 0xb0, 0x20, 0x3a, 0xb7, 0x87, 0xee, 0xe4, 0xb2, 0xd0, 0x5d, 0xb8, 0x6c, 0x13, + 0x6c, 0x51, 0x6c, 0xb6, 0x1d, 0xda, 0xb7, 0x06, 0x8d, 0x19, 0xbe, 0xc0, 0x9a, 0x20, 0x36, 0x39, + 0x4d, 0x5f, 0x02, 0x14, 0x97, 0x29, 0x35, 0xd9, 0x87, 0x85, 0x7d, 0xa7, 0xf3, 0x56, 0xf4, 0x4c, + 0xbe, 0xea, 0x25, 0x40, 0x71, 0x76, 0x52, 0xc8, 0x6f, 0x0b, 0x70, 0x6d, 0xc7, 0x22, 0x6d, 0xeb, + 0x14, 0xb7, 0x7c, 0xd7, 0xc5, 0x36, 0xfd, 0x61, 0xd6, 0x8c, 0x96, 0x60, 0x6e, 0x40, 0x86, 0x1e, + 0x6e, 0xcc, 0xf2, 0x4e, 0xd1, 0xd0, 0x1b, 0x70, 0x7d, 0x54, 0x1b, 0xa9, 0xe8, 0x31, 0x2c, 0x7f, + 0x4e, 0x1c, 0x8a, 0x5b, 0x7e, 0xbf, 0xef, 0xd0, 0x1d, 0x62, 0x0d, 0x7a, 0x93, 0xdb, 0x44, 0x83, + 0x46, 0x9a, 0xa9, 0x14, 0xf8, 0x0c, 0xae, 0xb4, 0x5c, 0x6c, 0x79, 0xc3, 0xc1, 0xe4, 0x72, 0x16, + 0xe0, 0x6a, 0xc4, 0x4b, 0xb2, 0xff, 0x0c, 0xae, 0xa9, 0x29, 0xc7, 0xce, 0xd7, 0x78, 0x72, 0x29, + 0x8f, 0xe0, 0xfa, 0x28, 0x4b, 0x19, 0x5f, 0x08, 0x8a, 0x81, 0xf3, 0x35, 0xe6, 0xdc, 0x66, 0x0d, + 0xfe, 0xad, 0xbf, 0x86, 0x95, 0x8d, 0xc1, 0xc0, 0xbd, 0xd8, 0x71, 0xa8, 0x45, 0x29, 0x71, 0xda, + 0x43, 0x8a, 0x27, 0x0f, 0x73, 0xa4, 0x41, 0x85, 0xe0, 0x37, 0x4e, 0xe0, 0xf8, 0x1e, 0xdf, 0xf7, + 0x9a, 0x11, 0xb5, 0xf5, 0x55, 0xd0, 0xb2, 0x44, 0x4a, 0x8b, 0xfc, 0x6d, 0x06, 0xd0, 0x36, 0xa6, + 0x76, 0xcf, 0xc0, 0x7d, 0x9f, 0x4e, 0x6e, 0x0f, 0x76, 0xaa, 0x10, 0xce, 0x8a, 0x2b, 0x52, 0x35, + 0x64, 0x8b, 0xb9, 0x5e, 0xd7, 0x27, 0x76, 0xe4, 0x7a, 0xbc, 0x81, 0x96, 0xa1, 0xec, 0xf9, 0x26, + 0xb5, 0x4e, 0x83, 0x46, 0x51, 0x1c, 0x42, 0x9e, 0x7f, 0x62, 0x9d, 0x06, 0xa8, 0x01, 0x65, 0xea, + 0xf4, 0xb1, 0x3f, 0xa4, 0x8d, 0xb9, 0xdb, 0x85, 0x07, 0x73, 0x46, 0xd8, 0x64, 0x53, 0x82, 0xa0, + 0x67, 0x9e, 0xe1, 0x8b, 0x46, 0x49, 0x48, 0x08, 0x82, 0xde, 0x73, 0x7c, 0x81, 0x6e, 0xc1, 0xfc, + 0x99, 0xe7, 0x9f, 0x7b, 0x66, 0xcf, 0x67, 0x87, 0x5a, 0x99, 0x77, 0x02, 0x27, 0xed, 0x32, 0x0a, + 0x5a, 0x81, 0x8a, 0xe7, 0x9b, 0x22, 0x00, 0xaa, 0x5c, 0x5a, 0xd9, 0xf3, 0x8f, 0x58, 0x13, 0x3d, + 0x85, 0xcb, 0x42, 0x4f, 0x73, 0x60, 0x11, 0xab, 0x1f, 0x34, 0x80, 0x2f, 0xf9, 0x8a, 0x5a, 0x32, + 0xb7, 0x4e, 0x4d, 0x0c, 0x3a, 0xe2, 0x63, 0x9e, 0x15, 0x2b, 0x95, 0x7a, 0x55, 0xbf, 0x06, 0x8b, + 0x09, 0x03, 0xaa, 0xd0, 0x69, 0xf1, 0xd0, 0x53, 0xd6, 0x9a, 0x4a, 0xe8, 0xa4, 0x99, 0x4a, 0x81, + 0xff, 0x9e, 0x81, 0x85, 0x1d, 0x4c, 0x37, 0x88, 0xdd, 0x73, 0xde, 0x4c, 0x61, 0x23, 0x6f, 0x40, + 0xd5, 0xe6, 0x11, 0x6a, 0x3a, 0x1d, 0xb9, 0x97, 0x15, 0x41, 0xd8, 0xeb, 0xb0, 0x5d, 0x1e, 0x10, + 0xdc, 0x75, 0xde, 0xf2, 0xed, 0xac, 0x1a, 0xb2, 0x85, 0x3e, 0x85, 0x52, 0xd7, 0x27, 0x7d, 0x8b, + 0xf2, 0xed, 0xbc, 0xf2, 0xe4, 0x76, 0x28, 0x2a, 0xa5, 0xd9, 0xfa, 0x36, 0x1f, 0x67, 0xc8, 0xf1, + 0x2c, 0x5a, 0x06, 0x16, 0xed, 0xf1, 0xdd, 0xae, 0x19, 0xfc, 0x9b, 0x39, 0x01, 0x7e, 0x6b, 0xbb, + 0xc3, 0x0e, 0x6e, 0x94, 0x6e, 0xcf, 0x3e, 0xa8, 0x19, 0x61, 0x13, 0xad, 0x01, 0x60, 0xd7, 0xe9, + 0xb0, 0xed, 0xa2, 0x3d, 0xbe, 0xd5, 0x15, 0xa3, 0xca, 0x29, 0x47, 0x6c, 0xe2, 0x43, 0x58, 0x70, + 0x3c, 0x3e, 0xd2, 0x74, 0xbb, 0x81, 0xd9, 0x76, 0xfd, 0x76, 0xd0, 0xa8, 0xf0, 0x51, 0x57, 0x65, + 0xc7, 0x8b, 0x6e, 0xd0, 0x64, 0x64, 0xfd, 0x29, 0x94, 0x84, 0x2a, 0xa8, 0x0c, 0xb3, 0xaf, 0xf6, + 0x8e, 0xea, 0x97, 0xd8, 0xc7, 0xc9, 0x86, 0x51, 0x2f, 0x20, 0x80, 0xd2, 0xc9, 0x86, 0x61, 0xee, + 0xbc, 0xaa, 0xcf, 0xa0, 0x79, 0x28, 0xb3, 0xef, 0xe6, 0xab, 0x27, 0xf5, 0x59, 0xfd, 0x01, 0xa0, + 0xf8, 0x8a, 0x54, 0xc4, 0x77, 0x2c, 0x6a, 0x71, 0x33, 0xd7, 0x0c, 0xfe, 0xcd, 0xfc, 0x60, 0xd7, + 0x0a, 0x5e, 0xf8, 0xb6, 0xe5, 0x36, 0x89, 0xe5, 0xd9, 0xbd, 0x29, 0xc4, 0xbb, 0xfe, 0x31, 0x34, + 0xd2, 0x4c, 0xa5, 0x12, 0x4b, 0x30, 0xf7, 0xc6, 0x72, 0x87, 0x58, 0xde, 0xea, 0xa2, 0xa1, 0x7f, + 0x57, 0x80, 0x06, 0x77, 0xd3, 0x63, 0x7f, 0x48, 0x6c, 0x2c, 0x66, 0x4d, 0xee, 0x24, 0x3f, 0x83, + 0x85, 0x80, 0x33, 0x34, 0x63, 0x0c, 0x66, 0xf2, 0x18, 0x18, 0x75, 0x31, 0xd8, 0x48, 0x5c, 0x5b, + 0x92, 0x41, 0x9b, 0xab, 0xc4, 0xfd, 0xa9, 0x66, 0xd4, 0x82, 0x98, 0x9a, 0x6c, 0xb7, 0xa9, 0x45, + 0x4e, 0x31, 0x35, 0x09, 0xee, 0x72, 0xcf, 0xaa, 0x19, 0x55, 0x41, 0x31, 0x70, 0x57, 0x7f, 0x0a, + 0x2b, 0x19, 0x4b, 0x53, 0xaf, 0x1c, 0x82, 0x83, 0xa1, 0x4b, 0xc3, 0x57, 0x8e, 0x68, 0xe9, 0x3b, + 0x30, 0xbf, 0x1d, 0x4c, 0xe3, 0x8a, 0xbf, 0x07, 0x35, 0xc1, 0x48, 0xd9, 0x1f, 0x13, 0xe2, 0x13, + 0xe9, 0x05, 0xa2, 0xa1, 0xff, 0xa5, 0x00, 0x57, 0xf9, 0xad, 0x67, 0xe0, 0xee, 0xe4, 0x66, 0xaf, + 0xc3, 0x2c, 0xb3, 0x84, 0x38, 0xea, 0xd9, 0x67, 0xe2, 0x06, 0x98, 0x4d, 0xde, 0x00, 0xe8, 0x0e, + 0xd4, 0x7c, 0xb7, 0x63, 0x46, 0xfd, 0xc2, 0x80, 0xf3, 0xbe, 0xdb, 0x31, 0xc2, 0x21, 0xd1, 0xe9, + 0x3c, 0x17, 0x3b, 0x9d, 0x9f, 0x15, 0x2b, 0xa5, 0x7a, 0x59, 0x6f, 0x40, 0x5d, 0x69, 0x2e, 0x16, + 0xf9, 0xac, 0x58, 0x29, 0xd4, 0x67, 0x74, 0x0f, 0x96, 0xb6, 0x1d, 0xaf, 0xb3, 0x8f, 0xc9, 0x29, + 0x6e, 0x5a, 0xc1, 0x14, 0x0e, 0x9d, 0x55, 0xa8, 0x86, 0x6a, 0x06, 0x8d, 0x19, 0x1e, 0xf3, 0x8a, + 0xa0, 0x7f, 0x08, 0xd7, 0x46, 0xe4, 0xa9, 0xc0, 0x6b, 0x5b, 0x81, 0x70, 0xf9, 0xaa, 0xc1, 0xbf, + 0xf5, 0x7f, 0x15, 0x60, 0x41, 0x1c, 0x96, 0xdb, 0x3e, 0x39, 0xfb, 0x1f, 0x70, 0xf5, 0x47, 0x50, + 0x1c, 0xf8, 0xbe, 0xcb, 0xb7, 0x27, 0x36, 0xe7, 0xb0, 0xfd, 0x0b, 0x6c, 0xd3, 0x23, 0xdf, 0x77, + 0x9b, 0xc5, 0x6f, 0x99, 0x50, 0x3e, 0x8a, 0xdd, 0x66, 0x96, 0xeb, 0xfa, 0xe7, 0xa6, 0xcb, 0xa2, + 0x5c, 0xde, 0x8e, 0xc0, 0x49, 0x3c, 0xee, 0xd9, 0xd3, 0x32, 0xbe, 0xbc, 0xe8, 0x25, 0xbd, 0xb2, + 0x17, 0x18, 0x98, 0x59, 0x60, 0xcf, 0x3b, 0x22, 0xfe, 0x29, 0xc1, 0x41, 0x30, 0x95, 0xcb, 0x80, + 0x70, 0xa6, 0xb1, 0xcb, 0x40, 0x10, 0xf6, 0x3a, 0xfa, 0x4f, 0x41, 0xcb, 0x92, 0x29, 0xf7, 0xe6, + 0x16, 0xcc, 0x3b, 0x9e, 0x39, 0x90, 0x64, 0x19, 0x85, 0xe0, 0x44, 0x03, 0x85, 0xca, 0xc7, 0xaf, + 0x87, 0x56, 0xd0, 0x9b, 0xb2, 0xca, 0x01, 0x67, 0x1a, 0x53, 0x59, 0x10, 0x42, 0x95, 0xd3, 0x32, + 0xdf, 0x55, 0x65, 0x17, 0x6e, 0x8e, 0xde, 0xc3, 0xdb, 0xc4, 0xef, 0xbf, 0x34, 0x5e, 0x4c, 0x25, + 0xb6, 0x87, 0xc4, 0x95, 0x1a, 0xb3, 0x4f, 0xfd, 0x0e, 0xdc, 0xca, 0x95, 0x26, 0xb7, 0xfd, 0x10, + 0x16, 0xc5, 0x90, 0xe6, 0xd0, 0xeb, 0xb8, 0x53, 0x78, 0xd6, 0x3e, 0x84, 0xa5, 0x24, 0xc3, 0x31, + 0x57, 0xdc, 0xef, 0x66, 0xa0, 0x7e, 0x8c, 0x69, 0xcb, 0xf7, 0xba, 0xce, 0xe9, 0xe4, 0x06, 0xf8, + 0x14, 0xca, 0xd8, 0xa3, 0xc4, 0xc1, 0xe2, 0x04, 0x98, 0x7f, 0x72, 0x33, 0x9c, 0x36, 0x2a, 0x64, + 0x7d, 0xcb, 0xa3, 0xe4, 0xc2, 0x08, 0x87, 0x6b, 0xbf, 0x29, 0xc0, 0x1c, 0x27, 0x31, 0x23, 0xb2, + 0x07, 0xa2, 0x38, 0x0f, 0xd8, 0x27, 0x5a, 0x83, 0x2a, 0xbf, 0x09, 0xcd, 0x80, 0x12, 0x61, 0xdc, + 0xdd, 0x4b, 0x46, 0x85, 0x93, 0x8e, 0x29, 0x41, 0x77, 0x60, 0x5e, 0x74, 0x3b, 0x1e, 0x7d, 0xfa, + 0x84, 0xc7, 0xe8, 0xdc, 0xee, 0x25, 0x03, 0x38, 0x71, 0x8f, 0xd1, 0xd0, 0x2d, 0x10, 0x2d, 0xb3, + 0xcd, 0xa2, 0x98, 0x07, 0xe4, 0xee, 0x25, 0x43, 0x70, 0x6d, 0xb2, 0xf0, 0x2d, 0xcb, 0x9b, 0x57, + 0x5f, 0x84, 0x85, 0x98, 0xaa, 0x72, 0x8b, 0x6c, 0x58, 0xdc, 0xc4, 0x2e, 0x66, 0x79, 0xcf, 0x74, + 0xec, 0x84, 0xa0, 0x78, 0x86, 0x2f, 0x84, 0x91, 0xaa, 0x06, 0xff, 0xd6, 0xaf, 0xc3, 0x52, 0x52, + 0x88, 0x14, 0xee, 0xb0, 0xec, 0x3b, 0xa0, 0x3e, 0xc1, 0xad, 0x61, 0x40, 0xfd, 0xfe, 0xae, 0xef, + 0x9f, 0x05, 0x53, 0x51, 0x81, 0x7b, 0xc3, 0x4c, 0xcc, 0x1b, 0x56, 0x41, 0xcb, 0x12, 0x25, 0x15, + 0x39, 0x81, 0x46, 0xd3, 0xb2, 0xcf, 0x86, 0x83, 0x69, 0xea, 0xa1, 0x3f, 0x86, 0x95, 0x0c, 0xae, + 0x63, 0x5c, 0xf6, 0x35, 0xdc, 0xc9, 0x0a, 0xa9, 0x29, 0x45, 0x4f, 0xa6, 0x5d, 0xee, 0x81, 0x3e, + 0x4e, 0xa4, 0xb4, 0xcf, 0x01, 0x20, 0x76, 0xc5, 0xbd, 0x70, 0x6c, 0xec, 0x4d, 0xe1, 0x42, 0xd5, + 0x5b, 0xb0, 0x98, 0xe0, 0x27, 0x6d, 0xf2, 0x08, 0x90, 0x2b, 0x48, 0x66, 0xd0, 0xf3, 0x09, 0x35, + 0x3d, 0xab, 0x1f, 0x5e, 0x9f, 0x75, 0xd9, 0x73, 0xcc, 0x3a, 0x0e, 0xac, 0x3e, 0xdf, 0xb4, 0x1d, + 0x4c, 0xf7, 0xbc, 0xae, 0xbf, 0x31, 0xbd, 0xa4, 0x55, 0xff, 0x09, 0xac, 0x64, 0x70, 0x95, 0x0a, + 0xde, 0x04, 0x50, 0xd9, 0xaa, 0xdc, 0xba, 0x18, 0x85, 0xa9, 0xd4, 0xb2, 0x5c, 0x7b, 0xe8, 0x5a, + 0x14, 0xb7, 0x7a, 0xd8, 0x3e, 0x0b, 0x86, 0xfd, 0xc9, 0x55, 0xfa, 0x7f, 0x58, 0xc9, 0xe0, 0x2a, + 0x55, 0xd2, 0xa0, 0x62, 0x4b, 0x9a, 0xb4, 0x54, 0xd4, 0x66, 0xdb, 0xb6, 0x83, 0xe9, 0xb1, 0x67, + 0x0d, 0x82, 0x9e, 0x3f, 0x39, 0x9a, 0xa3, 0x7f, 0x00, 0x8b, 0x09, 0x7e, 0x63, 0x5c, 0xf9, 0x9b, + 0x02, 0xdc, 0xcd, 0x72, 0xac, 0xa9, 0x29, 0xc3, 0xf2, 0xe6, 0x1e, 0xa5, 0x03, 0x53, 0x5d, 0x4b, + 0x65, 0xd6, 0x7e, 0x49, 0x5c, 0x76, 0xc9, 0xf2, 0x2e, 0x6b, 0x48, 0x7b, 0x32, 0x15, 0xe4, 0x63, + 0x37, 0x86, 0xb4, 0xa7, 0xdf, 0x87, 0x7b, 0xe3, 0x15, 0x93, 0x3e, 0xff, 0xc7, 0x02, 0x2c, 0xed, + 0x60, 0x6a, 0x58, 0xe7, 0xad, 0x9e, 0xe5, 0x9d, 0x4e, 0x03, 0x10, 0xb9, 0x0b, 0x97, 0xbb, 0xc4, + 0xef, 0x9b, 0x09, 0x54, 0xa4, 0x6a, 0xd4, 0x18, 0x31, 0x7a, 0xf4, 0xde, 0x82, 0x79, 0xea, 0x9b, + 0x89, 0x67, 0x73, 0xd5, 0x00, 0xea, 0x87, 0x03, 0xf4, 0xbf, 0x16, 0xe1, 0xda, 0x88, 0x62, 0x72, + 0x23, 0x76, 0x61, 0x9e, 0x58, 0xe7, 0xa6, 0x2d, 0xc8, 0x8d, 0x02, 0xbf, 0xa7, 0xde, 0x8f, 0x25, + 0xbb, 0xe9, 0x39, 0xeb, 0x11, 0xc9, 0x00, 0x12, 0xf5, 0x6a, 0xdf, 0xcd, 0x42, 0x35, 0xea, 0x41, + 0xcb, 0x50, 0x66, 0xc9, 0x2a, 0x7b, 0xb2, 0x08, 0x17, 0x2b, 0xb1, 0xe6, 0x5e, 0x27, 0x02, 0x93, + 0x66, 0x14, 0x98, 0x84, 0xd6, 0xa0, 0xe2, 0xe1, 0x73, 0x91, 0x02, 0x73, 0xe5, 0x9b, 0x33, 0x8d, + 0x82, 0x51, 0xf6, 0xf0, 0x39, 0x4f, 0x82, 0xd7, 0xa0, 0xc2, 0x9e, 0xfd, 0xbc, 0xbb, 0xa8, 0xba, + 0x7d, 0xb7, 0xc3, 0xbb, 0x0f, 0xa1, 0xea, 0x0f, 0x30, 0xb1, 0x28, 0x5b, 0xfb, 0x1c, 0xcf, 0xd6, + 0x3f, 0x79, 0xc7, 0x05, 0xac, 0x1f, 0x86, 0x13, 0x0d, 0xc5, 0x83, 0xd9, 0x9c, 0xd9, 0x44, 0x31, + 0x15, 0xf0, 0x4c, 0x8d, 0x58, 0xe7, 0xd1, 0x78, 0xe6, 0x4b, 0x4c, 0xa9, 0xbe, 0xdf, 0xc1, 0x3c, + 0x6d, 0x9f, 0xe3, 0x0a, 0xed, 0xfb, 0x1d, 0xcc, 0xe1, 0x19, 0x7c, 0x2e, 0xba, 0x2a, 0xa2, 0xcb, + 0xc3, 0xe7, 0xbc, 0xeb, 0x1e, 0x5c, 0x09, 0x57, 0x6a, 0xb6, 0x2f, 0xd8, 0x89, 0x50, 0x15, 0x69, + 0xa2, 0x5c, 0x6b, 0x93, 0xd1, 0xd8, 0xa8, 0x70, 0xc1, 0x72, 0x14, 0x88, 0x51, 0x72, 0xc9, 0x7c, + 0x94, 0xee, 0x40, 0x55, 0xa9, 0x33, 0x0f, 0xe5, 0x97, 0x07, 0xcf, 0x0f, 0x0e, 0x3f, 0x3f, 0xa8, + 0x5f, 0x42, 0x55, 0x98, 0xdb, 0xd8, 0xdc, 0xdc, 0xda, 0x14, 0x89, 0x7f, 0xeb, 0xf0, 0x68, 0x6f, + 0x6b, 0x53, 0x24, 0xfe, 0x9b, 0x5b, 0x2f, 0xb6, 0x4e, 0xb6, 0x36, 0xeb, 0xb3, 0xa8, 0x06, 0x95, + 0xfd, 0xc3, 0xcd, 0xbd, 0x6d, 0xd6, 0x55, 0x64, 0x5d, 0xc6, 0xd6, 0xc1, 0xc6, 0xfe, 0xd6, 0x66, + 0x7d, 0x0e, 0xd5, 0xa1, 0x76, 0xf2, 0xc5, 0xd1, 0x96, 0xd9, 0xda, 0xdd, 0x38, 0xd8, 0xd9, 0xda, + 0xac, 0x97, 0xf4, 0x3f, 0x14, 0xa0, 0x71, 0x8c, 0x2d, 0x62, 0xf7, 0xb6, 0x1d, 0x17, 0x07, 0xcd, + 0x0b, 0x76, 0x9a, 0x4e, 0xee, 0xdc, 0x4b, 0x30, 0xf7, 0x7a, 0x88, 0x65, 0xf6, 0x51, 0x35, 0x44, + 0x23, 0xcc, 0x09, 0x67, 0x55, 0x4e, 0x78, 0x1d, 0x4a, 0x5d, 0xc7, 0xa5, 0x98, 0x88, 0xed, 0x37, + 0x64, 0x4b, 0xff, 0x04, 0x56, 0x32, 0xb4, 0x52, 0xe9, 0x6b, 0x97, 0x91, 0xb9, 0x4f, 0xd7, 0x0c, + 0xd1, 0xd0, 0xff, 0x5c, 0x80, 0x1b, 0x89, 0x39, 0x2d, 0xdf, 0xa3, 0xd8, 0xa3, 0x3f, 0xdc, 0x62, + 0x3e, 0x80, 0xba, 0xdd, 0x1b, 0x7a, 0x67, 0x98, 0x25, 0xb2, 0x42, 0x57, 0x99, 0x14, 0x5d, 0x95, + 0xf4, 0xe8, 0x3c, 0xb9, 0x80, 0xd5, 0x6c, 0x5d, 0xe5, 0x12, 0x1b, 0x50, 0xee, 0x5b, 0xd4, 0xee, + 0x45, 0x8b, 0x0c, 0x9b, 0x68, 0x0d, 0x80, 0x7f, 0x9a, 0xb1, 0xdb, 0xbb, 0xca, 0x29, 0x9b, 0x16, + 0xb5, 0xd0, 0x6d, 0xa8, 0x61, 0xaf, 0x63, 0xfa, 0x5d, 0x93, 0xd3, 0x24, 0x94, 0x09, 0xd8, 0xeb, + 0x1c, 0x76, 0xf7, 0x19, 0x45, 0xff, 0x7d, 0x01, 0x4a, 0x02, 0x08, 0x0c, 0xdf, 0xf1, 0x85, 0xe8, + 0x1d, 0xcf, 0x62, 0x98, 0x5f, 0xb3, 0x62, 0xa5, 0xfc, 0x1b, 0xfd, 0x18, 0x56, 0xa2, 0x03, 0xd4, + 0x27, 0xce, 0xd7, 0xdc, 0x2d, 0xcd, 0x1e, 0xb6, 0x3a, 0x98, 0xc8, 0x13, 0x69, 0x39, 0x3c, 0x50, + 0xa3, 0xfe, 0x5d, 0xde, 0x8d, 0xde, 0x83, 0x2b, 0x7d, 0x87, 0x10, 0x9f, 0x98, 0x04, 0x77, 0xfb, + 0xd6, 0x20, 0x68, 0x14, 0xf9, 0x53, 0xf0, 0xb2, 0xa0, 0x1a, 0x82, 0xa8, 0x7f, 0x01, 0x6b, 0x3b, + 0x98, 0x8a, 0x34, 0x73, 0xd3, 0x21, 0xd8, 0x9e, 0x1e, 0xf8, 0xfd, 0x7f, 0x70, 0x33, 0x8f, 0xf5, + 0x18, 0x10, 0xfc, 0xdb, 0x02, 0x2c, 0xb5, 0x5c, 0xdf, 0xc3, 0xec, 0x36, 0x60, 0x89, 0xef, 0xe4, + 0x5e, 0x74, 0x5f, 0xe6, 0xd6, 0x33, 0x79, 0xb9, 0xb5, 0xcc, 0xaa, 0xef, 0x47, 0xe8, 0xf4, 0x6c, + 0x26, 0xc0, 0x2b, 0x7b, 0xf5, 0x65, 0xb8, 0x36, 0xa2, 0xa1, 0xf4, 0xad, 0xbf, 0x17, 0x60, 0x35, + 0xd1, 0xb3, 0xe7, 0x51, 0x4c, 0x3c, 0xeb, 0x07, 0x5c, 0x43, 0x26, 0x10, 0x31, 0xfb, 0xee, 0x40, + 0x84, 0x7e, 0x0b, 0xd6, 0x72, 0x96, 0xa0, 0xb0, 0x6b, 0x66, 0x8f, 0x37, 0xd3, 0xc6, 0xae, 0xd3, + 0x4c, 0xa5, 0xc0, 0xb7, 0x4c, 0xa0, 0xc7, 0x8f, 0xa1, 0xa9, 0x09, 0xe4, 0xf7, 0x11, 0x76, 0x2d, + 0xea, 0xbc, 0x91, 0x30, 0xb1, 0x7c, 0x03, 0x84, 0x44, 0x76, 0x25, 0x08, 0xad, 0x46, 0x25, 0x4b, + 0xad, 0x7e, 0x5d, 0x60, 0xa9, 0xcc, 0xc0, 0x75, 0xec, 0xe9, 0xc2, 0xf8, 0xe8, 0x21, 0x94, 0xc4, + 0xa6, 0x8c, 0xc1, 0x8f, 0xe4, 0x08, 0x7d, 0x0d, 0x6e, 0x64, 0xea, 0x20, 0x75, 0x7c, 0x09, 0x2b, + 0x87, 0x03, 0xea, 0xf4, 0x79, 0xcc, 0x4d, 0x6f, 0xb3, 0x56, 0x41, 0xcb, 0x62, 0x2b, 0x84, 0x3e, + 0xf9, 0xe7, 0x4d, 0x5e, 0xaf, 0x0d, 0x8b, 0x5e, 0xa2, 0xd0, 0x8d, 0xbe, 0x84, 0xfa, 0x68, 0xad, + 0x19, 0xdd, 0x4a, 0x4b, 0x4b, 0x94, 0xb6, 0xb5, 0xdb, 0xf9, 0x03, 0xe4, 0x0a, 0x4b, 0xff, 0xf9, + 0xe6, 0xc1, 0x4c, 0x65, 0x06, 0x7d, 0x15, 0xd6, 0x88, 0x63, 0x05, 0x64, 0x14, 0x9f, 0x9e, 0x59, + 0xb1, 0xd6, 0xee, 0x8c, 0x19, 0x91, 0x90, 0x50, 0x40, 0xcf, 0x01, 0x54, 0x45, 0x18, 0xad, 0x24, + 0x27, 0xc6, 0x2a, 0xd3, 0x9a, 0x96, 0xd5, 0x95, 0x66, 0xa6, 0x2a, 0xbf, 0x8a, 0x59, 0xaa, 0xb8, + 0xac, 0x98, 0x65, 0x14, 0x8a, 0x43, 0x66, 0x9f, 0xc3, 0x95, 0x64, 0x85, 0x16, 0xad, 0x45, 0x4f, + 0xb5, 0xac, 0x3a, 0xb2, 0x76, 0x33, 0xaf, 0x7b, 0x84, 0xf1, 0x97, 0x12, 0xdb, 0x8d, 0xd5, 0x62, + 0xd5, 0x9e, 0xe5, 0x94, 0x7e, 0xd5, 0x9e, 0xe5, 0x96, 0x71, 0x63, 0x7a, 0x27, 0x8b, 0xa3, 0x4a, + 0xef, 0xcc, 0x3a, 0xac, 0xd2, 0x3b, 0xbb, 0xa6, 0x1a, 0x39, 0x83, 0x0d, 0x28, 0x5d, 0xd4, 0x44, + 0xd1, 0x5e, 0xe7, 0xd6, 0x58, 0x35, 0x7d, 0xdc, 0x90, 0x11, 0xed, 0x0f, 0x60, 0x3e, 0x56, 0xd9, + 0x43, 0xd1, 0x46, 0xa5, 0xeb, 0xa5, 0xda, 0x8d, 0xcc, 0xbe, 0xb4, 0xb1, 0x47, 0xf3, 0x21, 0x65, + 0xec, 0x9c, 0x62, 0xa1, 0x32, 0x76, 0x6e, 0xe1, 0x2f, 0x64, 0xbf, 0x0f, 0xa0, 0x6a, 0x52, 0xca, + 0xe3, 0x52, 0x95, 0x37, 0xe5, 0x71, 0xe9, 0x12, 0x56, 0x68, 0xe0, 0x8f, 0xb9, 0xb6, 0xa3, 0x35, + 0x26, 0xa5, 0x6d, 0x4e, 0x49, 0x4b, 0x69, 0x9b, 0x57, 0x9e, 0x8a, 0x87, 0x73, 0xaa, 0x68, 0xa3, + 0xc2, 0x39, 0xaf, 0x54, 0xa5, 0xc2, 0x39, 0xb7, 0xe2, 0x13, 0xd9, 0xe3, 0x47, 0x50, 0xdc, 0x0e, + 0xec, 0x33, 0xb4, 0x18, 0x4d, 0x51, 0xf5, 0x1e, 0x6d, 0x29, 0x49, 0x1c, 0x99, 0xba, 0x05, 0x95, + 0xb0, 0xe4, 0x81, 0x96, 0x13, 0xde, 0xae, 0xca, 0x37, 0x5a, 0x23, 0xdd, 0x31, 0xc2, 0xe6, 0x04, + 0x2e, 0x27, 0xea, 0x15, 0x68, 0x35, 0x92, 0x9a, 0x51, 0x36, 0xd1, 0xd6, 0x72, 0x7a, 0x47, 0x2c, + 0xf7, 0x1c, 0x40, 0x01, 0xff, 0x6a, 0x9f, 0x53, 0xb5, 0x0e, 0xb5, 0xcf, 0x19, 0x75, 0x82, 0x50, + 0x45, 0x1b, 0x50, 0x1a, 0xbb, 0x57, 0x81, 0x94, 0x5b, 0x4b, 0x50, 0x81, 0x94, 0x0f, 0xfd, 0xc7, + 0xa3, 0x35, 0x8d, 0xb6, 0xc7, 0x85, 0xe4, 0xa0, 0xff, 0x71, 0x21, 0x79, 0x60, 0x7d, 0x24, 0x84, + 0xa4, 0x0b, 0xee, 0x12, 0x25, 0x47, 0xf7, 0xf3, 0x62, 0x28, 0x09, 0xda, 0x6b, 0xef, 0x7f, 0xef, + 0xb8, 0x11, 0xeb, 0x1d, 0x43, 0x2d, 0x8e, 0x92, 0xa3, 0x1b, 0x49, 0x06, 0x09, 0x38, 0x51, 0x5b, + 0xcd, 0xee, 0x4c, 0x05, 0xde, 0x2f, 0x41, 0xcb, 0x07, 0x0a, 0xd1, 0x07, 0xe3, 0x74, 0x4c, 0x0a, + 0x7c, 0xf8, 0x2e, 0x43, 0x93, 0x2b, 0x7a, 0x50, 0x40, 0xbb, 0x50, 0x8d, 0xc0, 0x6b, 0xd4, 0xc8, + 0x83, 0xde, 0xb5, 0x95, 0x8c, 0x9e, 0x11, 0xeb, 0x7c, 0x06, 0xb5, 0x38, 0x18, 0xad, 0xac, 0x93, + 0x81, 0x83, 0x2b, 0xeb, 0x64, 0xe2, 0xd7, 0xf1, 0x23, 0x59, 0xc1, 0x99, 0xb1, 0x23, 0x39, 0x85, + 0x99, 0xc6, 0x8e, 0xe4, 0x34, 0xfe, 0x19, 0x39, 0x4d, 0x9b, 0xff, 0x33, 0x91, 0xc4, 0x20, 0x51, + 0xfc, 0xa7, 0x85, 0x4c, 0xd0, 0x53, 0x9d, 0x42, 0xb9, 0x00, 0x66, 0x6c, 0x3f, 0xbf, 0x82, 0x85, + 0x14, 0xa8, 0xa8, 0x64, 0xe4, 0xa1, 0x98, 0x4a, 0x46, 0x2e, 0x22, 0x19, 0xad, 0xa2, 0x09, 0x65, + 0xf9, 0xa7, 0x13, 0xba, 0x1e, 0xcd, 0x4a, 0xfc, 0x46, 0xa5, 0x2d, 0xa7, 0xe8, 0x23, 0x96, 0x3d, + 0x82, 0xf9, 0x18, 0xe2, 0x88, 0xe2, 0x77, 0xc4, 0x08, 0x92, 0xa8, 0x2c, 0x9b, 0x01, 0x51, 0xc6, + 0xd6, 0xfd, 0x2b, 0x96, 0x2a, 0x8d, 0xc1, 0xff, 0xd0, 0x87, 0xe3, 0xfc, 0x73, 0x54, 0xe8, 0xa3, + 0x77, 0x1b, 0x3c, 0xb2, 0xaa, 0x9f, 0xc3, 0xe5, 0x04, 0x96, 0xa5, 0x4e, 0xe0, 0x2c, 0xc0, 0x51, + 0x9d, 0xc0, 0x99, 0x00, 0x58, 0x6c, 0x6d, 0x67, 0xb0, 0x94, 0x05, 0x31, 0xa0, 0xbb, 0x2a, 0x2a, + 0x72, 0xc1, 0x12, 0xed, 0xde, 0xf8, 0x41, 0x29, 0x61, 0x6d, 0x58, 0x48, 0xe1, 0x35, 0xca, 0x81, + 0xf2, 0x00, 0x26, 0xe5, 0x40, 0xb9, 0x60, 0x4f, 0x4c, 0x06, 0x06, 0x94, 0xae, 0xda, 0xa0, 0xd8, + 0xe3, 0x39, 0xa7, 0x78, 0xa4, 0x8e, 0xe8, 0x31, 0x45, 0x1f, 0x75, 0xb8, 0xb4, 0x61, 0x21, 0x55, + 0xa8, 0x51, 0x4b, 0xc9, 0xab, 0x0c, 0xa9, 0xa5, 0xe4, 0x56, 0x79, 0x62, 0x4b, 0xf1, 0xe1, 0x7a, + 0x36, 0x28, 0x81, 0xde, 0x8b, 0x6d, 0x6f, 0x3e, 0x1e, 0xa2, 0xdd, 0xff, 0xbe, 0x61, 0x23, 0xe1, + 0x77, 0x02, 0x97, 0x13, 0xf9, 0xb4, 0x72, 0xb2, 0x2c, 0x94, 0x43, 0x39, 0x59, 0x36, 0xc2, 0x10, + 0xba, 0xae, 0x3b, 0x02, 0x41, 0x84, 0x59, 0x3a, 0xba, 0x97, 0x39, 0x7f, 0x04, 0x87, 0xd0, 0xde, + 0xfb, 0x9e, 0x51, 0xe9, 0xb7, 0xe9, 0x68, 0x76, 0x1e, 0x4f, 0xde, 0x32, 0xc1, 0x80, 0x78, 0xf2, + 0x96, 0x93, 0xd8, 0x27, 0xd8, 0x27, 0xd3, 0xec, 0x38, 0xfb, 0xcc, 0xd4, 0x3f, 0xce, 0x3e, 0x27, + 0x43, 0x0f, 0xd9, 0x77, 0x61, 0x31, 0x23, 0x49, 0x46, 0x31, 0xdf, 0xcc, 0xcb, 0xe2, 0xb5, 0xbb, + 0x63, 0xc7, 0xa4, 0x5f, 0x4b, 0xe9, 0xb4, 0x58, 0x45, 0x49, 0x6e, 0x26, 0xae, 0xa2, 0x24, 0x3f, + 0xab, 0x0e, 0x85, 0x34, 0x3f, 0x7e, 0xc5, 0x06, 0xbb, 0x56, 0x7b, 0xdd, 0xf6, 0xfb, 0x8f, 0xc5, + 0xe7, 0x47, 0x3e, 0x39, 0x7d, 0x2c, 0x58, 0x3c, 0xe6, 0xbf, 0x8b, 0x3f, 0x3e, 0xf5, 0x65, 0x7b, + 0xd0, 0x6e, 0x97, 0x38, 0xe9, 0xe9, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x17, 0x47, 0x56, 0x02, + 0x7f, 0x2e, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/proto/repository-service.proto b/proto/repository-service.proto index 4650a79dce8..65303281db3 100644 --- a/proto/repository-service.proto +++ b/proto/repository-service.proto @@ -401,6 +401,10 @@ message CreateForkRequest { // This pool repository must reside on the same storage shard // as the target repository. ObjectPool pool = 3 [(additional_repository)=true]; + // Clone using --local and --no-hardlinks flags if possible. This is faster + // than going through the normal git transport, but both + // source and target repositories must reside on the same storage shard. + bool allow_local = 4; } message CreateForkResponse {} diff --git a/ruby/proto/gitaly/repository-service_pb.rb b/ruby/proto/gitaly/repository-service_pb.rb index 811c40bf5f3..557e3c8335f 100644 --- a/ruby/proto/gitaly/repository-service_pb.rb +++ b/ruby/proto/gitaly/repository-service_pb.rb @@ -136,6 +136,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do optional :repository, :message, 1, "gitaly.Repository" optional :source_repository, :message, 2, "gitaly.Repository" optional :pool, :message, 3, "gitaly.ObjectPool" + optional :allow_local, :bool, 4 end add_message "gitaly.CreateForkResponse" do end -- GitLab From 67cf6564bcec8b7a34860a47247e95a4c6cf04cb Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Sat, 12 Dec 2020 08:19:59 -0800 Subject: [PATCH 2/3] Refactor CreateFork and add test for local mode --- internal/gitaly/service/repository/fork.go | 173 +++++++++++------- .../gitaly/service/repository/fork_test.go | 4 + 2 files changed, 107 insertions(+), 70 deletions(-) diff --git a/internal/gitaly/service/repository/fork.go b/internal/gitaly/service/repository/fork.go index 44c86457c03..bcc76e6b2f8 100644 --- a/internal/gitaly/service/repository/fork.go +++ b/internal/gitaly/service/repository/fork.go @@ -8,6 +8,7 @@ import ( "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" "github.com/sirupsen/logrus" + "gitlab.com/gitlab-org/gitaly/internal/command" "gitlab.com/gitlab-org/gitaly/internal/git" "gitlab.com/gitlab-org/gitaly/internal/git/objectpool" "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" @@ -18,6 +19,16 @@ import ( "google.golang.org/grpc/status" ) +type commandArgs struct { + ctx context.Context + req *gitalypb.CreateForkRequest + sourceRepository *gitalypb.Repository + targetRepository *gitalypb.Repository + targetRepositoryFullPath string + objectPool *objectpool.ObjectPool + sourceObjectPoolPath string +} + func (s *server) CreateFork(ctx context.Context, req *gitalypb.CreateForkRequest) (*gitalypb.CreateForkResponse, error) { targetRepository := req.Repository sourceRepository := req.SourceRepository @@ -26,70 +37,11 @@ func (s *server) CreateFork(ctx context.Context, req *gitalypb.CreateForkRequest return nil, helper.ErrInvalidArgument(err) } - targetRepositoryFullPath, err := s.locator.GetPath(targetRepository) + targetRepositoryFullPath, err := s.cleanTargetRepository(targetRepository) if err != nil { return nil, err } - if info, err := os.Stat(targetRepositoryFullPath); err != nil { - if !os.IsNotExist(err) { - return nil, status.Errorf(codes.Internal, "CreateFork: check destination path: %v", err) - } - - // directory does not exist, proceed - } else { - if !info.IsDir() { - return nil, status.Errorf(codes.InvalidArgument, "CreateFork: destination path exists") - } - - if err := os.Remove(targetRepositoryFullPath); err != nil { - return nil, status.Errorf(codes.InvalidArgument, "CreateFork: destination directory is not empty") - } - } - - if err := os.MkdirAll(targetRepositoryFullPath, 0770); err != nil { - return nil, status.Errorf(codes.Internal, "CreateFork: create dest dir: %v", err) - } - - objectPool, sourceObjectPoolPath, err := s.getObjectPool(req) - if err != nil { - return nil, err - } - - flags := []git.Option{ - git.Flag{Name: "--bare"}, - } - var args []string - var postSepArgs []string - - if req.GetAllowLocal() && sourceRepository.GetStorageName() == targetRepository.GetStorageName() { - sourceRepositoryFullPath, err := s.locator.GetPath(sourceRepository) - if err != nil { - return nil, err - } - - if _, err := os.Stat(sourceRepositoryFullPath); err != nil { - if !os.IsNotExist(err) { - return nil, status.Errorf(codes.Internal, "CreateFork: check source path: %v", err) - } - } - - flags = append(flags, git.Flag{Name: "--local"}, git.Flag{Name: "--no-hardlinks"}) - args = []string{sourceRepositoryFullPath} - postSepArgs = []string{targetRepositoryFullPath} - } else { - flags = append(flags, git.Flag{Name: "--no-local"}) - postSepArgs = []string{ - fmt.Sprintf("%s:%s", gitalyssh.GitalyInternalURL, sourceRepository.RelativePath), - targetRepositoryFullPath, - } - } - - if objectPool != nil { - flags = append(flags, git.ValueFlag{Name: "--reference", Value: sourceObjectPoolPath}) - ctxlogrus.AddFields(ctx, logrus.Fields{"object_pool_path": sourceObjectPoolPath}) - } - ctxlogrus.AddFields(ctx, logrus.Fields{ "source_storage": sourceRepository.GetStorageName(), "source_path": sourceRepository.GetRelativePath(), @@ -97,20 +49,19 @@ func (s *server) CreateFork(ctx context.Context, req *gitalypb.CreateForkRequest "target_path": targetRepository.GetRelativePath(), }) - env, err := gitalyssh.UploadPackEnv(ctx, &gitalypb.SSHUploadPackRequest{Repository: sourceRepository}) + objectPool, sourceObjectPoolPath, err := s.getObjectPool(req) if err != nil { return nil, err } - cmd, err := git.SafeBareCmd(ctx, git.CmdStream{}, env, nil, - git.SubCmd{ - Name: "clone", - Flags: flags, - Args: args, - PostSepArgs: postSepArgs, - }, - git.WithRefTxHook(ctx, req.Repository, s.cfg), - ) + cmd, err := s.cloneCommand(commandArgs{ + ctx: ctx, + req: req, + sourceRepository: sourceRepository, + targetRepository: targetRepository, + targetRepositoryFullPath: targetRepositoryFullPath, + objectPool: objectPool, + sourceObjectPoolPath: sourceObjectPoolPath}) if err != nil { return nil, status.Errorf(codes.Internal, "CreateFork: clone cmd start: %v", err) } @@ -161,6 +112,35 @@ func validateCreateForkRequest(req *gitalypb.CreateForkRequest) error { return nil } +func (s *server) cleanTargetRepository(targetRepository *gitalypb.Repository) (string, error) { + targetRepositoryFullPath, err := s.locator.GetPath(targetRepository) + if err != nil { + return "", err + } + + if info, err := os.Stat(targetRepositoryFullPath); err != nil { + if !os.IsNotExist(err) { + return "", status.Errorf(codes.Internal, "CreateFork: check destination path: %v", err) + } + + // directory does not exist, proceed + } else { + if !info.IsDir() { + return "", status.Errorf(codes.InvalidArgument, "CreateFork: destination path exists") + } + + if err := os.Remove(targetRepositoryFullPath); err != nil { + return "", status.Errorf(codes.InvalidArgument, "CreateFork: destination directory is not empty") + } + } + + if err := os.MkdirAll(targetRepositoryFullPath, 0770); err != nil { + return "", status.Errorf(codes.Internal, "CreateFork: create dest dir: %v", err) + } + + return targetRepositoryFullPath, nil +} + func (s *server) getObjectPool(req *gitalypb.CreateForkRequest) (*objectpool.ObjectPool, string, error) { repository := req.GetPool().GetRepository() @@ -180,3 +160,56 @@ func (s *server) getObjectPool(req *gitalypb.CreateForkRequest) (*objectpool.Obj return objectPool, sourceObjectPoolPath, nil } + +func (s *server) cloneCommand(a commandArgs) (*command.Command, error) { + flags := []git.Option{ + git.Flag{Name: "--bare"}, + } + var args []string + var postSepArgs []string + + if a.objectPool != nil { + flags = append(flags, git.ValueFlag{Name: "--reference", Value: a.sourceObjectPoolPath}) + ctxlogrus.AddFields(a.ctx, logrus.Fields{"object_pool_path": a.sourceObjectPoolPath}) + } + + if a.req.GetAllowLocal() && a.sourceRepository.GetStorageName() == a.targetRepository.GetStorageName() { + sourceRepositoryFullPath, err := s.locator.GetPath(a.sourceRepository) + if err != nil { + return nil, err + } + + if _, err := os.Stat(sourceRepositoryFullPath); err != nil { + if !os.IsNotExist(err) { + return nil, status.Errorf(codes.Internal, "CreateFork: check source path: %v", err) + } + } + + flags = append(flags, git.Flag{Name: "--local"}, git.Flag{Name: "--no-hardlinks"}) + args = []string{sourceRepositoryFullPath} + postSepArgs = []string{a.targetRepositoryFullPath} + } else { + flags = append(flags, git.Flag{Name: "--no-local"}) + postSepArgs = []string{ + fmt.Sprintf("%s:%s", gitalyssh.GitalyInternalURL, a.sourceRepository.RelativePath), + a.targetRepositoryFullPath, + } + } + + env, err := gitalyssh.UploadPackEnv(a.ctx, &gitalypb.SSHUploadPackRequest{Repository: a.sourceRepository}) + if err != nil { + return nil, err + } + + cmd, err := git.SafeBareCmd(a.ctx, git.CmdStream{}, env, nil, + git.SubCmd{ + Name: "clone", + Flags: flags, + Args: args, + PostSepArgs: postSepArgs, + }, + git.WithRefTxHook(a.ctx, a.req.Repository, s.cfg), + ) + + return cmd, err +} diff --git a/internal/gitaly/service/repository/fork_test.go b/internal/gitaly/service/repository/fork_test.go index 1920a6c6d0f..4fd93ba4f65 100644 --- a/internal/gitaly/service/repository/fork_test.go +++ b/internal/gitaly/service/repository/fork_test.go @@ -38,10 +38,13 @@ func TestSuccessfulCreateForkRequest(t *testing.T) { name string secure bool withPool bool + local bool beforeRequest func(repoPath string) }{ {name: "secure", secure: true}, {name: "insecure"}, + {name: "secure in local mode", secure: true, local: true}, + {name: "insecure in local mode", local: true}, {name: "existing empty directory target", beforeRequest: createEmptyTarget}, {name: "secure with pool", secure: true, withPool: true}, {name: "insecure with pool", withPool: true}, @@ -101,6 +104,7 @@ func TestSuccessfulCreateForkRequest(t *testing.T) { req := &gitalypb.CreateForkRequest{ Repository: forkedRepo, SourceRepository: testRepo, + AllowLocal: tt.local, } if tt.withPool { -- GitLab From 425e29c3003ef12b99c4cbf33177fb9133308a17 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Sat, 12 Dec 2020 08:21:17 -0800 Subject: [PATCH 3/3] Move log context fields out of CreateFork This centralizes the logging in cloneCommand(). --- internal/gitaly/service/repository/fork.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/internal/gitaly/service/repository/fork.go b/internal/gitaly/service/repository/fork.go index bcc76e6b2f8..4a19a281a7f 100644 --- a/internal/gitaly/service/repository/fork.go +++ b/internal/gitaly/service/repository/fork.go @@ -42,13 +42,6 @@ func (s *server) CreateFork(ctx context.Context, req *gitalypb.CreateForkRequest return nil, err } - ctxlogrus.AddFields(ctx, logrus.Fields{ - "source_storage": sourceRepository.GetStorageName(), - "source_path": sourceRepository.GetRelativePath(), - "target_storage": targetRepository.GetStorageName(), - "target_path": targetRepository.GetRelativePath(), - }) - objectPool, sourceObjectPoolPath, err := s.getObjectPool(req) if err != nil { return nil, err @@ -162,6 +155,13 @@ func (s *server) getObjectPool(req *gitalypb.CreateForkRequest) (*objectpool.Obj } func (s *server) cloneCommand(a commandArgs) (*command.Command, error) { + ctxlogrus.AddFields(a.ctx, logrus.Fields{ + "source_storage": a.sourceRepository.GetStorageName(), + "source_path": a.sourceRepository.GetRelativePath(), + "target_storage": a.targetRepository.GetStorageName(), + "target_path": a.targetRepository.GetRelativePath(), + }) + flags := []git.Option{ git.Flag{Name: "--bare"}, } -- GitLab