diff options
-rw-r--r-- | changelogs/unreleased/jc-praefect-object-pools.yml | 5 | ||||
-rw-r--r-- | internal/praefect/coordinator.go | 9 | ||||
-rw-r--r-- | internal/praefect/coordinator_test.go | 12 | ||||
-rw-r--r-- | internal/praefect/protoregistry/protoregistry.go | 26 | ||||
-rw-r--r-- | internal/praefect/protoregistry/targetrepo_test.go | 32 | ||||
-rw-r--r-- | proto/go/gitalypb/objectpool.pb.go | 71 | ||||
-rw-r--r-- | proto/go/gitalypb/shared.pb.go | 133 | ||||
-rw-r--r-- | proto/objectpool.proto | 12 | ||||
-rw-r--r-- | proto/shared.proto | 7 | ||||
-rw-r--r-- | ruby/proto/gitaly/shared_pb.rb | 1 |
10 files changed, 194 insertions, 114 deletions
diff --git a/changelogs/unreleased/jc-praefect-object-pools.yml b/changelogs/unreleased/jc-praefect-object-pools.yml new file mode 100644 index 000000000..ab30f0e2c --- /dev/null +++ b/changelogs/unreleased/jc-praefect-object-pools.yml @@ -0,0 +1,5 @@ +--- +title: Enable second repository to have its storage re-written +merge_request: 1548 +author: +type: other diff --git a/internal/praefect/coordinator.go b/internal/praefect/coordinator.go index 57772f68b..e8706a101 100644 --- a/internal/praefect/coordinator.go +++ b/internal/praefect/coordinator.go @@ -133,6 +133,15 @@ func (c *Coordinator) getStorageForRepositoryMessage(mi protoregistry.MethodInfo targetRepo.StorageName = primary.Storage + additionalRepo, ok, err := mi.AdditionalRepo(m) + if err != nil { + return "", nil, err + } + + if ok { + additionalRepo.StorageName = primary.Storage + } + b, err := proxy.Codec().Marshal(m) if err != nil { return "", nil, err diff --git a/internal/praefect/coordinator_test.go b/internal/praefect/coordinator_test.go index 5418fec53..28c581784 100644 --- a/internal/praefect/coordinator_test.go +++ b/internal/praefect/coordinator_test.go @@ -58,12 +58,14 @@ func TestStreamDirector(t *testing.T) { coordinator := NewCoordinator(log.Default(), datastore, clientConnections, conf) require.NoError(t, coordinator.RegisterProtos(protoregistry.GitalyProtoFileDescriptors...)) - frame, err := proto.Marshal(&gitalypb.GarbageCollectRequest{ - Repository: &targetRepo, + frame, err := proto.Marshal(&gitalypb.FetchIntoObjectPoolRequest{ + Origin: &targetRepo, + ObjectPool: &gitalypb.ObjectPool{Repository: &targetRepo}, + Repack: false, }) require.NoError(t, err) - fullMethod := "/gitaly.RepositoryService/GarbageCollect" + fullMethod := "/gitaly.ObjectPoolService/FetchIntoObjectPool" peeker := &mockPeeker{frame} _, conn, jobUpdateFunc, err := coordinator.streamDirector(ctx, fullMethod, peeker) @@ -76,6 +78,10 @@ func TestStreamDirector(t *testing.T) { m, err := protoMessageFromPeeker(mi, peeker) require.NoError(t, err) + rewrittenTargetRepo, err := mi.TargetRepo(m) + require.NoError(t, err) + require.Equal(t, "praefect-internal-1", rewrittenTargetRepo.GetStorageName(), "stream director should have rewritten the storage name") + rewrittenRepo, err := mi.TargetRepo(m) require.NoError(t, err) require.Equal(t, "praefect-internal-1", rewrittenRepo.GetStorageName(), "stream director should have rewritten the storage name") diff --git a/internal/praefect/protoregistry/protoregistry.go b/internal/praefect/protoregistry/protoregistry.go index 931da1461..94fd464be 100644 --- a/internal/praefect/protoregistry/protoregistry.go +++ b/internal/praefect/protoregistry/protoregistry.go @@ -82,12 +82,29 @@ type MethodInfo struct { Operation OpType Scope Scope targetRepo []int + additionalRepo []int requestName string // protobuf message name for input type requestFactory protoFactory } // TargetRepo returns the target repository for a protobuf message if it exists func (mi MethodInfo) TargetRepo(msg proto.Message) (*gitalypb.Repository, error) { + return mi.getRepo(msg, mi.targetRepo) +} + +// AdditionalRepo returns the additional repository for a protobuf message that needs a storage rewritten +// if it exists +func (mi MethodInfo) AdditionalRepo(msg proto.Message) (*gitalypb.Repository, bool, error) { + if mi.additionalRepo == nil { + return nil, false, nil + } + + repo, err := mi.getRepo(msg, mi.additionalRepo) + + return repo, true, err +} + +func (mi MethodInfo) getRepo(msg proto.Message, targetOid []int) (*gitalypb.Repository, error) { if mi.requestName != proto.MessageName(msg) { return nil, fmt.Errorf( "proto message %s does not match expected RPC request message %s", @@ -95,7 +112,7 @@ func (mi MethodInfo) TargetRepo(msg proto.Message) (*gitalypb.Repository, error) ) } - return reflectFindRepoTarget(msg, mi.targetRepo) + return reflectFindRepoTarget(msg, targetOid) } // UnmarshalRequestProto will unmarshal the bytes into the method's request @@ -235,6 +252,13 @@ func parseMethodInfo(methodDesc *descriptor.MethodDescriptorProto) (MethodInfo, return MethodInfo{}, err } mi.targetRepo = targetRepo + + if opMsg.GetAdditionalRepositoryField() != "" { + mi.additionalRepo, err = parseOID(opMsg.GetAdditionalRepositoryField()) + if err != nil { + return MethodInfo{}, err + } + } } return mi, nil diff --git a/internal/praefect/protoregistry/targetrepo_test.go b/internal/praefect/protoregistry/targetrepo_test.go index 8d6629524..23708b53b 100644 --- a/internal/praefect/protoregistry/targetrepo_test.go +++ b/internal/praefect/protoregistry/targetrepo_test.go @@ -35,12 +35,13 @@ func TestProtoRegistryTargetRepo(t *testing.T) { } testcases := []struct { - desc string - svc string - method string - pbMsg proto.Message - expectRepo *gitalypb.Repository - expectErr error + desc string + svc string + method string + pbMsg proto.Message + expectRepo *gitalypb.Repository + expectAdditionalRepo *gitalypb.Repository + expectErr error }{ { desc: "valid request type single depth", @@ -71,6 +72,18 @@ func TestProtoRegistryTargetRepo(t *testing.T) { }, expectRepo: testRepos[1], }, + { + desc: "target nested, includes additional repository", + svc: "ObjectPoolService", + method: "FetchIntoObjectPool", + pbMsg: &gitalypb.FetchIntoObjectPoolRequest{ + Origin: testRepos[0], + ObjectPool: &gitalypb.ObjectPool{Repository: testRepos[1]}, + Repack: false, + }, + expectRepo: testRepos[1], + expectAdditionalRepo: testRepos[0], + }, } for _, tc := range testcases { @@ -87,6 +100,13 @@ func TestProtoRegistryTargetRepo(t *testing.T) { if tc.expectRepo != actualTarget { t.Fatal("pointers do not match") } + + if tc.expectAdditionalRepo != nil { + additionalRepo, ok, err := info.AdditionalRepo(tc.pbMsg) + require.True(t, ok) + require.NoError(t, err) + require.Equal(t, tc.expectAdditionalRepo, additionalRepo) + } }) } } diff --git a/proto/go/gitalypb/objectpool.pb.go b/proto/go/gitalypb/objectpool.pb.go index 0683df02d..2fa353791 100644 --- a/proto/go/gitalypb/objectpool.pb.go +++ b/proto/go/gitalypb/objectpool.pb.go @@ -582,41 +582,42 @@ func init() { func init() { proto.RegisterFile("objectpool.proto", fileDescriptor_949871727a345eae) } var fileDescriptor_949871727a345eae = []byte{ - // 535 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x95, 0x41, 0x6f, 0xd3, 0x30, - 0x1c, 0xc5, 0xe5, 0x4d, 0x94, 0xf2, 0x2f, 0x87, 0x61, 0x04, 0xad, 0x0c, 0x5b, 0xbb, 0xb0, 0x8d, - 0x32, 0x69, 0x29, 0xed, 0x3e, 0x01, 0x30, 0x0d, 0x21, 0x21, 0x40, 0x61, 0x5c, 0xb8, 0xa0, 0x24, - 0xb3, 0x3a, 0xb3, 0x2c, 0xff, 0xe0, 0xb8, 0x48, 0xe3, 0xc4, 0x19, 0x71, 0xe0, 0x82, 0xf6, 0x6d, - 0xf8, 0x60, 0x3b, 0xa1, 0x36, 0x6e, 0xd3, 0x36, 0x71, 0x12, 0x6d, 0xbb, 0x25, 0xd6, 0xeb, 0x7b, - 0xbf, 0xfe, 0xed, 0xe7, 0xc0, 0x1a, 0x7a, 0x5f, 0xb9, 0xaf, 0x22, 0xc4, 0xc0, 0x8e, 0x24, 0x2a, - 0xa4, 0xb5, 0xa1, 0x50, 0x6e, 0x70, 0xce, 0xee, 0xc6, 0x27, 0xae, 0xe4, 0xc7, 0xc9, 0xaa, 0xf5, - 0x03, 0x9a, 0xaf, 0x24, 0x77, 0x15, 0x7f, 0x3f, 0xd1, 0x7f, 0x40, 0x0c, 0x1c, 0xfe, 0x6d, 0xc4, - 0x63, 0x45, 0xf7, 0xa1, 0x91, 0x98, 0x7c, 0x19, 0xbb, 0xb4, 0x48, 0x87, 0x74, 0x1b, 0x03, 0x6a, - 0x27, 0x36, 0xf6, 0x9c, 0x1e, 0x70, 0xf6, 0x4c, 0x77, 0xa1, 0x86, 0x52, 0x0c, 0x45, 0xd8, 0x5a, - 0x59, 0xd4, 0x3b, 0x3c, 0xc2, 0x58, 0x28, 0x94, 0xe7, 0x8e, 0x56, 0x58, 0x0c, 0x5a, 0xd9, 0xec, - 0x38, 0xc2, 0x30, 0xe6, 0xd6, 0x3b, 0x68, 0x1e, 0xf0, 0x80, 0xdf, 0x14, 0xd7, 0x38, 0x2b, 0xeb, - 0xa7, 0xb3, 0x7e, 0x13, 0xd8, 0x7c, 0x2b, 0xc2, 0xd3, 0x14, 0xf1, 0x08, 0x6f, 0x68, 0x1c, 0x03, - 0x00, 0x39, 0x73, 0x2d, 0x18, 0xc9, 0x9c, 0xca, 0xda, 0x02, 0xab, 0x88, 0x46, 0x43, 0xff, 0x21, - 0xb0, 0xfd, 0x29, 0x0c, 0x16, 0x84, 0x87, 0x12, 0xcf, 0xb2, 0xe0, 0x8b, 0x0c, 0xa4, 0x0a, 0xc3, - 0xf2, 0x9f, 0x5d, 0xa9, 0x34, 0xe3, 0x2e, 0xec, 0x94, 0x11, 0x69, 0x78, 0x07, 0x1e, 0x3b, 0xfc, - 0x78, 0x14, 0x05, 0xc2, 0x77, 0x15, 0x9f, 0x63, 0xb8, 0x3a, 0xb2, 0xd5, 0x86, 0x75, 0x83, 0xa7, - 0x0e, 0x3d, 0x82, 0x8d, 0x03, 0x11, 0xfb, 0x18, 0x86, 0xdc, 0x57, 0xaf, 0x85, 0x7a, 0x11, 0x28, - 0x2e, 0x43, 0x57, 0xf1, 0xf8, 0x3a, 0xb1, 0x9b, 0xd0, 0x36, 0xba, 0xea, 0xe0, 0xbf, 0x04, 0xd8, - 0x21, 0x57, 0xfe, 0xc9, 0x9b, 0x50, 0xe5, 0x1c, 0xac, 0xb4, 0x32, 0xa4, 0xac, 0x32, 0x57, 0xda, - 0x17, 0xfa, 0x10, 0x6a, 0x92, 0x47, 0xae, 0x7f, 0xda, 0x5a, 0xed, 0x90, 0x6e, 0xdd, 0xd1, 0x6f, - 0xd6, 0x3a, 0x3c, 0xca, 0xc5, 0x4a, 0xb0, 0x07, 0xff, 0x6a, 0x70, 0x2f, 0x5d, 0xfe, 0xc8, 0xe5, - 0x77, 0xe1, 0x73, 0xea, 0xc1, 0xda, 0x72, 0x69, 0x69, 0x7b, 0x0a, 0x60, 0xb8, 0x4a, 0x58, 0xc7, - 0x2c, 0xd0, 0x33, 0x6a, 0x5c, 0x5e, 0x74, 0x6f, 0xd7, 0x09, 0x5b, 0xed, 0xdb, 0xfd, 0x71, 0xc6, - 0x72, 0x59, 0xd3, 0x0c, 0xc3, 0xb5, 0x90, 0x66, 0x18, 0x7b, 0xbe, 0x90, 0xf1, 0x93, 0x00, 0x33, - 0xd7, 0x8c, 0x3e, 0x9b, 0xba, 0x95, 0x5e, 0x0c, 0x6c, 0xb7, 0x8a, 0x34, 0x0f, 0xe1, 0x17, 0x81, - 0x8d, 0xe2, 0xc2, 0xd0, 0xbd, 0xa9, 0x77, 0xa5, 0xaa, 0x33, 0xbb, 0xaa, 0x5c, 0xe3, 0xdc, 0xb9, - 0xbc, 0xe8, 0xde, 0xaa, 0x13, 0x46, 0xfa, 0x14, 0xe1, 0x41, 0x6e, 0x7d, 0xe8, 0x56, 0x7a, 0x1c, - 0xcd, 0x8d, 0x65, 0xdb, 0x25, 0xaa, 0x6c, 0xe0, 0x08, 0x9a, 0x86, 0xe2, 0xd0, 0x9d, 0xd9, 0x56, - 0x16, 0xf6, 0x95, 0x3d, 0x2d, 0xd5, 0x65, 0x63, 0x05, 0xdc, 0xcf, 0x39, 0xf4, 0xd4, 0x9a, 0x5a, - 0x99, 0x8b, 0xca, 0x9e, 0x14, 0x6a, 0x32, 0x51, 0x2f, 0x9f, 0x7f, 0x1e, 0xff, 0x20, 0x70, 0x3d, - 0xdb, 0xc7, 0xb3, 0x5e, 0xf2, 0xb8, 0x87, 0x72, 0xd8, 0x4b, 0x6c, 0x7a, 0x93, 0x2f, 0x70, 0x6f, - 0x88, 0xfa, 0x3d, 0xf2, 0xbc, 0xda, 0x64, 0x69, 0xff, 0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf5, - 0xbc, 0x47, 0x6f, 0xbe, 0x07, 0x00, 0x00, + // 557 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x95, 0xcd, 0x6e, 0xd3, 0x40, + 0x14, 0x85, 0x35, 0xad, 0x08, 0xe1, 0xa6, 0x42, 0x61, 0x10, 0x24, 0x1a, 0x68, 0x93, 0x0e, 0x6d, + 0x31, 0x95, 0xea, 0x10, 0xf7, 0x09, 0x80, 0xaa, 0x08, 0x09, 0x01, 0x32, 0x65, 0xc3, 0x06, 0x39, + 0xee, 0x55, 0x6a, 0xea, 0x7a, 0xcc, 0x78, 0x82, 0x54, 0xb6, 0x6c, 0x41, 0x62, 0x83, 0xf2, 0x52, + 0x3c, 0x51, 0x56, 0x28, 0xf6, 0x24, 0xce, 0xdf, 0x24, 0x56, 0xdb, 0x9d, 0x6d, 0x9d, 0x9c, 0xf3, + 0xf9, 0xfa, 0x9e, 0x09, 0x54, 0x45, 0xe7, 0x2b, 0xfa, 0x2a, 0x16, 0x22, 0xb4, 0x63, 0x29, 0x94, + 0xa0, 0xa5, 0x6e, 0xa0, 0xbc, 0xf0, 0x92, 0x6d, 0x24, 0x67, 0x9e, 0xc4, 0xd3, 0xec, 0x29, 0xff, + 0x01, 0xb5, 0x57, 0x12, 0x3d, 0x85, 0xef, 0x53, 0xfd, 0x07, 0x21, 0x42, 0x17, 0xbf, 0xf5, 0x30, + 0x51, 0xf4, 0x10, 0x2a, 0x99, 0xc9, 0x97, 0xa1, 0x4b, 0x9d, 0x34, 0x89, 0x55, 0x71, 0xa8, 0x9d, + 0xd9, 0xd8, 0x13, 0x7a, 0x10, 0xe3, 0x6b, 0xba, 0x0f, 0x25, 0x21, 0x83, 0x6e, 0x10, 0xd5, 0xd7, + 0xa6, 0xf5, 0x2e, 0xc6, 0x22, 0x09, 0x94, 0x90, 0x97, 0xae, 0x56, 0x70, 0x06, 0xf5, 0xf9, 0xec, + 0x24, 0x16, 0x51, 0x82, 0xfc, 0x1d, 0xd4, 0x8e, 0x30, 0xc4, 0x9b, 0xe2, 0x1a, 0x66, 0xcd, 0xfb, + 0xe9, 0xac, 0x5f, 0x04, 0xb6, 0xdf, 0x06, 0xd1, 0x79, 0x8e, 0x78, 0x22, 0x6e, 0x68, 0x1c, 0x0e, + 0x80, 0x1c, 0xbb, 0x2e, 0x19, 0xc9, 0x84, 0x8a, 0xef, 0x00, 0x5f, 0x46, 0xa3, 0xa1, 0xff, 0x10, + 0xd8, 0xfd, 0x14, 0x85, 0x53, 0xc2, 0x63, 0x29, 0x2e, 0xe6, 0xc1, 0xa7, 0x19, 0x48, 0x11, 0x86, + 0xd9, 0x97, 0x5d, 0x2b, 0x34, 0x63, 0x0b, 0xf6, 0x56, 0x11, 0x69, 0x78, 0x17, 0x1e, 0xbb, 0x78, + 0xda, 0x8b, 0xc3, 0xc0, 0xf7, 0x14, 0x4e, 0x30, 0x5c, 0x1d, 0x99, 0x37, 0x60, 0xd3, 0xe0, 0xa9, + 0x43, 0x4f, 0x60, 0xeb, 0x28, 0x48, 0x7c, 0x11, 0x45, 0xe8, 0xab, 0xd7, 0x81, 0x7a, 0x11, 0x2a, + 0x94, 0x91, 0xa7, 0x30, 0xb9, 0x4e, 0xec, 0x36, 0x34, 0x8c, 0xae, 0x3a, 0xf8, 0x2f, 0x01, 0x76, + 0x8c, 0xca, 0x3f, 0x7b, 0x13, 0xa9, 0x05, 0x8b, 0x95, 0x57, 0x86, 0xac, 0xaa, 0xcc, 0x95, 0xbe, + 0x0b, 0x7d, 0x08, 0x25, 0x89, 0xb1, 0xe7, 0x9f, 0xd7, 0xd7, 0x9b, 0xc4, 0x2a, 0xbb, 0xfa, 0x8e, + 0x6f, 0xc2, 0xa3, 0x85, 0x58, 0x19, 0xb6, 0xf3, 0xaf, 0x04, 0xf7, 0xf2, 0xc7, 0x1f, 0x51, 0x7e, + 0x0f, 0x7c, 0xa4, 0x08, 0xd5, 0xd9, 0xd2, 0xd2, 0xc6, 0x08, 0xc0, 0x70, 0x94, 0xb0, 0xa6, 0x59, + 0xa0, 0x67, 0x74, 0x77, 0xd0, 0xb7, 0xa0, 0x4c, 0xd8, 0x7a, 0xdb, 0x6e, 0x73, 0xe2, 0xd0, 0x0e, + 0x54, 0x67, 0xfb, 0x9a, 0xc7, 0x18, 0x4e, 0x86, 0x3c, 0xc6, 0x58, 0xf5, 0xca, 0xa0, 0x6f, 0xdd, + 0xd6, 0x31, 0xf4, 0x27, 0x01, 0x66, 0x6e, 0x1a, 0x7d, 0x36, 0x72, 0x5b, 0x79, 0x36, 0xb0, 0xfd, + 0x22, 0xd2, 0x99, 0x37, 0x25, 0x0e, 0x4f, 0x29, 0x7e, 0x13, 0xd8, 0x5a, 0x5e, 0x1b, 0x7a, 0x30, + 0xb2, 0x2f, 0x54, 0x78, 0x66, 0x17, 0x95, 0x6b, 0xa2, 0x8d, 0x41, 0xdf, 0x2a, 0x0f, 0x89, 0xd2, + 0xc9, 0x0b, 0x78, 0xb0, 0xb0, 0x47, 0x74, 0x27, 0xdf, 0x4b, 0x73, 0x75, 0xd9, 0xee, 0x0a, 0x95, + 0xce, 0xbc, 0x33, 0xe8, 0x5b, 0xb7, 0xd2, 0x4c, 0xda, 0x83, 0x9a, 0xa1, 0x41, 0x74, 0x6f, 0xfc, + 0x41, 0x97, 0x16, 0x97, 0x3d, 0x5d, 0xa9, 0x9b, 0x8f, 0x8d, 0xe0, 0xfe, 0x82, 0xed, 0xa7, 0x7c, + 0x64, 0x65, 0x6e, 0x2c, 0x7b, 0xb2, 0x54, 0x33, 0xbb, 0xd1, 0xce, 0x70, 0xa3, 0xdb, 0x2f, 0x9f, + 0x7f, 0x1e, 0xfe, 0x2a, 0xf4, 0x3a, 0xb6, 0x2f, 0x2e, 0x5a, 0xd9, 0xe5, 0x81, 0x90, 0xdd, 0x56, + 0xe6, 0xd5, 0x4a, 0xff, 0x8f, 0x5b, 0x5d, 0xa1, 0xef, 0xe3, 0x4e, 0xa7, 0x94, 0x3e, 0x3a, 0xfc, + 0x1f, 0x00, 0x00, 0xff, 0xff, 0xb8, 0xbc, 0xac, 0x59, 0xcc, 0x07, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/proto/go/gitalypb/shared.pb.go b/proto/go/gitalypb/shared.pb.go index 05bd72e83..43c7b4cb7 100644 --- a/proto/go/gitalypb/shared.pb.go +++ b/proto/go/gitalypb/shared.pb.go @@ -132,10 +132,11 @@ type OperationMsg struct { // // For example, the following OID refers to a target repo field // nested in a one-of field, both at field one: "1.1" - TargetRepositoryField string `protobuf:"bytes,3,opt,name=target_repository_field,json=targetRepositoryField,proto3" json:"target_repository_field,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + TargetRepositoryField string `protobuf:"bytes,3,opt,name=target_repository_field,json=targetRepositoryField,proto3" json:"target_repository_field,omitempty"` + AdditionalRepositoryField string `protobuf:"bytes,4,opt,name=additional_repository_field,json=additionalRepositoryField,proto3" json:"additional_repository_field,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *OperationMsg) Reset() { *m = OperationMsg{} } @@ -184,6 +185,13 @@ func (m *OperationMsg) GetTargetRepositoryField() string { return "" } +func (m *OperationMsg) GetAdditionalRepositoryField() string { + if m != nil { + return m.AdditionalRepositoryField + } + return "" +} + type Repository struct { StorageName string `protobuf:"bytes,2,opt,name=storage_name,json=storageName,proto3" json:"storage_name,omitempty"` RelativePath string `protobuf:"bytes,3,opt,name=relative_path,json=relativePath,proto3" json:"relative_path,omitempty"` @@ -720,62 +728,63 @@ func init() { func init() { proto.RegisterFile("shared.proto", fileDescriptor_d8a4e87e678c5ced) } var fileDescriptor_d8a4e87e678c5ced = []byte{ - // 899 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0xdd, 0x6e, 0xe3, 0x44, - 0x14, 0x5e, 0x3b, 0xce, 0xdf, 0x89, 0x5b, 0xcc, 0x50, 0x84, 0x55, 0xb4, 0xbb, 0xc1, 0x48, 0xa8, - 0x42, 0x90, 0x56, 0x5d, 0x69, 0x2f, 0xe0, 0x86, 0xa4, 0x84, 0xaa, 0xcb, 0xa6, 0xae, 0x26, 0x2e, - 0x08, 0x6e, 0xac, 0x49, 0x3c, 0x9d, 0x0c, 0xb2, 0x33, 0xd6, 0x78, 0x52, 0xd1, 0xbd, 0xe4, 0x31, - 0x78, 0x08, 0x9e, 0x84, 0xf7, 0xe0, 0x31, 0x40, 0x33, 0x63, 0xa7, 0xd9, 0x6e, 0x41, 0xdc, 0xcd, - 0x39, 0xe7, 0x3b, 0xff, 0xe7, 0xb3, 0xc1, 0xaf, 0x56, 0x44, 0xd2, 0x6c, 0x54, 0x4a, 0xa1, 0x04, - 0xea, 0x30, 0xae, 0x48, 0x7e, 0x77, 0xf8, 0x9c, 0x09, 0xc1, 0x72, 0x7a, 0x6c, 0xb4, 0x8b, 0xcd, - 0xcd, 0xb1, 0xe2, 0x05, 0xad, 0x14, 0x29, 0x4a, 0x0b, 0x3c, 0x1c, 0x3e, 0x04, 0x64, 0xb4, 0x5a, - 0x4a, 0x5e, 0x2a, 0x21, 0x2d, 0x22, 0xfa, 0xdd, 0x05, 0x3f, 0x2e, 0xa9, 0x24, 0x8a, 0x8b, 0xf5, - 0xac, 0x62, 0x68, 0x04, 0xae, 0x28, 0x43, 0x67, 0xe8, 0x1c, 0xed, 0x9f, 0x3e, 0x1b, 0xd9, 0x44, - 0xa3, 0x5d, 0xc4, 0xbd, 0x80, 0x5d, 0x51, 0xa2, 0xaf, 0x61, 0x50, 0x2d, 0x45, 0x49, 0xd3, 0x9c, - 0xde, 0xd2, 0x3c, 0x74, 0x8d, 0xe3, 0xe1, 0xa3, 0x8e, 0x73, 0x8d, 0xc3, 0x60, 0xe0, 0xaf, 0x35, - 0x1a, 0xbd, 0x84, 0x8f, 0x14, 0x91, 0x8c, 0xaa, 0x54, 0xd2, 0x52, 0x54, 0x5c, 0x09, 0x79, 0x97, - 0xde, 0x70, 0x9a, 0x67, 0x61, 0x6b, 0xe8, 0x1c, 0xf5, 0xf1, 0x87, 0xd6, 0x8c, 0xb7, 0xd6, 0xef, - 0xb4, 0x31, 0x7a, 0x01, 0xfd, 0x6d, 0x64, 0x34, 0x80, 0xee, 0xf5, 0xe5, 0xf7, 0x97, 0xf1, 0x8f, - 0x97, 0xc1, 0x13, 0x2d, 0xcc, 0xae, 0x93, 0x71, 0x12, 0xe3, 0xc0, 0x41, 0x3e, 0xf4, 0xc6, 0x67, - 0x67, 0xd3, 0xf9, 0x3c, 0xc6, 0x81, 0x1b, 0x9d, 0x40, 0xdb, 0x54, 0x80, 0xf6, 0x01, 0xf0, 0xf4, - 0x2a, 0x9e, 0x5f, 0x24, 0x31, 0xfe, 0x29, 0x78, 0x82, 0x00, 0x3a, 0xf3, 0x29, 0xfe, 0x61, 0xaa, - 0x5d, 0x06, 0xd0, 0x9d, 0x27, 0x31, 0x1e, 0x9f, 0x4f, 0x03, 0x37, 0xfa, 0xc3, 0x05, 0xb8, 0x4f, - 0x8d, 0x3e, 0x01, 0xbf, 0x52, 0x42, 0x12, 0x46, 0xd3, 0x35, 0x29, 0xa8, 0xe9, 0xb5, 0x8f, 0x07, - 0xb5, 0xee, 0x92, 0x14, 0x14, 0x7d, 0x0a, 0x7b, 0x92, 0xe6, 0x44, 0xf1, 0x5b, 0x9a, 0x96, 0x44, - 0xad, 0xea, 0x36, 0xfc, 0x46, 0x79, 0x45, 0xd4, 0x0a, 0x9d, 0xc0, 0x01, 0xe3, 0x2a, 0x15, 0x8b, - 0x5f, 0xe8, 0x52, 0xa5, 0x19, 0x97, 0x74, 0xa9, 0xe3, 0x87, 0x9e, 0xc1, 0x22, 0xc6, 0x55, 0x6c, - 0x4c, 0xdf, 0x36, 0x16, 0x74, 0x0e, 0x43, 0xed, 0x41, 0x72, 0x45, 0xe5, 0x9a, 0x28, 0xfa, 0xd0, - 0x97, 0xd3, 0x2a, 0x6c, 0x0f, 0x5b, 0x47, 0x7d, 0xfc, 0x94, 0x71, 0x35, 0x6e, 0x60, 0x6f, 0x87, - 0xe1, 0xb4, 0xd2, 0xf5, 0xb1, 0x7c, 0x67, 0xd8, 0x61, 0xc7, 0xd6, 0xc7, 0xf2, 0x9d, 0x3e, 0x3f, - 0x83, 0xf7, 0x58, 0x9e, 0x96, 0x52, 0x98, 0x1c, 0xa6, 0x8d, 0x9e, 0x81, 0xed, 0xb1, 0xfc, 0xca, - 0x6a, 0x75, 0x1f, 0xaf, 0xbc, 0x9e, 0x13, 0xb8, 0xaf, 0xbc, 0x5e, 0x37, 0xe8, 0x61, 0x4f, 0xc3, - 0xa2, 0xbf, 0x1c, 0xe8, 0x9f, 0x73, 0x75, 0x26, 0x8a, 0x82, 0x2b, 0xb4, 0x0f, 0x2e, 0xcf, 0xcc, - 0x29, 0xf5, 0xb1, 0xcb, 0x33, 0x14, 0x42, 0xb7, 0xda, 0x98, 0x92, 0xcc, 0xe8, 0x7c, 0xdc, 0x88, - 0x08, 0x81, 0xb7, 0x10, 0xd9, 0x9d, 0x99, 0x96, 0x8f, 0xcd, 0x1b, 0x7d, 0x01, 0x1d, 0xb2, 0x51, - 0x2b, 0x21, 0xcd, 0x5c, 0x06, 0xa7, 0x07, 0xcd, 0x4d, 0xd9, 0xe8, 0x63, 0x63, 0xc3, 0x35, 0x06, - 0x9d, 0x42, 0x7f, 0x69, 0xf4, 0x8a, 0xca, 0xb0, 0xfd, 0x1f, 0x0e, 0xf7, 0x30, 0xf4, 0x14, 0xa0, - 0x24, 0x92, 0xae, 0x55, 0xca, 0xb3, 0x2a, 0xec, 0x98, 0xf9, 0xf5, 0xad, 0xe6, 0x22, 0xab, 0xd0, - 0xc7, 0xd0, 0xd7, 0x85, 0xa4, 0x15, 0x7f, 0x43, 0xc3, 0xee, 0xd0, 0x39, 0x6a, 0xe1, 0x9e, 0x56, - 0xcc, 0xf9, 0x1b, 0x1a, 0xad, 0xc0, 0xdf, 0x0d, 0xab, 0x3b, 0x30, 0x37, 0xe1, 0xd8, 0x0e, 0xf4, - 0x1b, 0x1d, 0x40, 0x9b, 0x16, 0x84, 0xe7, 0x75, 0xb7, 0x56, 0x40, 0x23, 0xf0, 0x32, 0xa2, 0xa8, - 0xe9, 0x75, 0xa0, 0x99, 0x62, 0x28, 0x3a, 0x6a, 0x28, 0x3a, 0x4a, 0x1a, 0x0e, 0x63, 0x83, 0x8b, - 0x22, 0x80, 0xe9, 0xaf, 0x5c, 0xcd, 0x15, 0x51, 0x9b, 0x4a, 0xc7, 0xbc, 0x25, 0xf9, 0xc6, 0x26, - 0x6a, 0x63, 0x2b, 0x44, 0x09, 0x74, 0x26, 0x92, 0xac, 0x97, 0xab, 0x47, 0xeb, 0x78, 0x09, 0x7b, - 0x35, 0xcb, 0x6c, 0xef, 0xa6, 0x9e, 0xc1, 0xe9, 0xfb, 0xcd, 0x7c, 0xb6, 0x1b, 0xc3, 0xbe, 0xc5, - 0x59, 0x29, 0xfa, 0xd3, 0x81, 0x56, 0x42, 0xd8, 0xa3, 0x31, 0xed, 0x6e, 0xdd, 0xed, 0x6e, 0xdf, - 0xc9, 0xd1, 0xfa, 0x5f, 0x39, 0xf4, 0x4d, 0x14, 0xb4, 0xaa, 0x08, 0xa3, 0x66, 0xcd, 0x3e, 0x6e, - 0x44, 0xcd, 0xb6, 0xfa, 0x69, 0x37, 0xd0, 0x36, 0x1b, 0x18, 0xd4, 0x3a, 0xbd, 0x04, 0x7d, 0x22, - 0x8a, 0x30, 0x46, 0xa5, 0x39, 0xe3, 0x7f, 0x3d, 0x11, 0x8b, 0x89, 0x6e, 0xc0, 0xbb, 0xae, 0xa8, - 0x44, 0x1f, 0x40, 0x9b, 0xe5, 0xe9, 0xf6, 0x32, 0x3d, 0x96, 0x5f, 0x64, 0xdb, 0x1e, 0xdd, 0xc7, - 0xf6, 0xd7, 0xda, 0xdd, 0xdf, 0x73, 0x18, 0xb0, 0x3c, 0xdd, 0x54, 0x9a, 0x62, 0x05, 0xad, 0x49, - 0x0b, 0x2c, 0xbf, 0xae, 0x35, 0xd1, 0x37, 0x00, 0x96, 0x78, 0x57, 0x42, 0xe4, 0xe8, 0x14, 0x60, - 0x87, 0x6e, 0x8e, 0xa9, 0x13, 0x35, 0x75, 0xde, 0x93, 0x0e, 0xef, 0xa0, 0x3e, 0x9f, 0x34, 0x11, - 0x92, 0xbb, 0x92, 0xbe, 0xfd, 0x7d, 0x03, 0xe8, 0x9c, 0xc5, 0xb3, 0xd9, 0x45, 0x12, 0x38, 0xa8, - 0x07, 0xde, 0xe4, 0x75, 0x3c, 0x09, 0x5c, 0xfd, 0x4a, 0xf0, 0x74, 0x1a, 0xb4, 0x50, 0x17, 0x5a, - 0xc9, 0xf8, 0x3c, 0xf0, 0xbe, 0x8a, 0xa1, 0x2b, 0xca, 0x54, 0xe9, 0x00, 0xcf, 0xde, 0xb9, 0xb1, - 0x19, 0x55, 0x2b, 0x91, 0xc5, 0xa5, 0xfe, 0x7e, 0x56, 0xe1, 0xdf, 0xbf, 0x3d, 0x20, 0xcc, 0xee, - 0x57, 0x1b, 0x77, 0x44, 0xa9, 0xcb, 0x98, 0x9c, 0xfc, 0xac, 0xcd, 0x39, 0x59, 0x8c, 0x96, 0xa2, - 0x38, 0xb6, 0xcf, 0x2f, 0x85, 0x64, 0xc7, 0xd6, 0xc9, 0xfe, 0x63, 0x8e, 0x99, 0xa8, 0xe5, 0x72, - 0xb1, 0xe8, 0x18, 0xd5, 0x8b, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x2f, 0xad, 0xe3, 0x2d, 0xbd, - 0x06, 0x00, 0x00, + // 920 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0xdd, 0x6e, 0xe3, 0xc4, + 0x17, 0x5f, 0x3b, 0xce, 0xd7, 0x89, 0xdb, 0xbf, 0xff, 0x43, 0x11, 0xa6, 0xab, 0xdd, 0x0d, 0x46, + 0x42, 0x15, 0x82, 0xb4, 0xea, 0x4a, 0x7b, 0x01, 0x12, 0x22, 0x2d, 0xa1, 0xea, 0xb2, 0xad, 0xab, + 0x89, 0x0b, 0x82, 0x1b, 0x6b, 0x12, 0x4f, 0x27, 0x83, 0xec, 0x8c, 0x35, 0x9e, 0x54, 0x74, 0x2f, + 0x79, 0x20, 0x9e, 0x84, 0x27, 0xe0, 0x05, 0x78, 0x0c, 0xd0, 0xcc, 0xd8, 0x49, 0xb6, 0x2d, 0x88, + 0xbb, 0x39, 0xe7, 0xfc, 0xce, 0xf7, 0xf9, 0xd9, 0xe0, 0x57, 0x0b, 0x22, 0x69, 0x36, 0x2a, 0xa5, + 0x50, 0x02, 0x75, 0x18, 0x57, 0x24, 0xbf, 0xdb, 0x7f, 0xc1, 0x84, 0x60, 0x39, 0x3d, 0x34, 0xda, + 0xd9, 0xea, 0xe6, 0x50, 0xf1, 0x82, 0x56, 0x8a, 0x14, 0xa5, 0x05, 0xee, 0x0f, 0xef, 0x03, 0x32, + 0x5a, 0xcd, 0x25, 0x2f, 0x95, 0x90, 0x16, 0x11, 0xfd, 0xe1, 0x82, 0x1f, 0x97, 0x54, 0x12, 0xc5, + 0xc5, 0xf2, 0xa2, 0x62, 0x68, 0x04, 0xae, 0x28, 0x43, 0x67, 0xe8, 0x1c, 0xec, 0x1e, 0x3f, 0x1f, + 0xd9, 0x44, 0xa3, 0x6d, 0xc4, 0x46, 0xc0, 0xae, 0x28, 0xd1, 0x97, 0x30, 0xa8, 0xe6, 0xa2, 0xa4, + 0x69, 0x4e, 0x6f, 0x69, 0x1e, 0xba, 0xc6, 0x71, 0xff, 0x51, 0xc7, 0xa9, 0xc6, 0x61, 0x30, 0xf0, + 0x37, 0x1a, 0x8d, 0x5e, 0xc1, 0x07, 0x8a, 0x48, 0x46, 0x55, 0x2a, 0x69, 0x29, 0x2a, 0xae, 0x84, + 0xbc, 0x4b, 0x6f, 0x38, 0xcd, 0xb3, 0xb0, 0x35, 0x74, 0x0e, 0xfa, 0xf8, 0x7d, 0x6b, 0xc6, 0x6b, + 0xeb, 0xb7, 0xda, 0x88, 0xbe, 0x82, 0xa7, 0x24, 0xcb, 0xb8, 0x0e, 0x4c, 0xf2, 0x87, 0xbe, 0x9e, + 0xf1, 0xfd, 0x70, 0x03, 0xb9, 0xe7, 0x1f, 0xbd, 0x84, 0xfe, 0xba, 0x32, 0x34, 0x80, 0xee, 0xf5, + 0xe5, 0x77, 0x97, 0xf1, 0x0f, 0x97, 0xc1, 0x13, 0x2d, 0x5c, 0x5c, 0x27, 0xe3, 0x24, 0xc6, 0x81, + 0x83, 0x7c, 0xe8, 0x8d, 0x4f, 0x4f, 0x27, 0xd3, 0x69, 0x8c, 0x03, 0x37, 0x3a, 0x82, 0xb6, 0xe9, + 0x00, 0xed, 0x02, 0xe0, 0xc9, 0x55, 0x3c, 0x3d, 0x4f, 0x62, 0xfc, 0x63, 0xf0, 0x04, 0x01, 0x74, + 0xa6, 0x13, 0xfc, 0xfd, 0x44, 0xbb, 0x0c, 0xa0, 0x3b, 0x4d, 0x62, 0x3c, 0x3e, 0x9b, 0x04, 0x6e, + 0xf4, 0x9b, 0x0b, 0xb0, 0x49, 0x8d, 0x3e, 0x02, 0xbf, 0x52, 0x42, 0x12, 0x46, 0xd3, 0x25, 0x29, + 0xa8, 0x99, 0x55, 0x1f, 0x0f, 0x6a, 0xdd, 0x25, 0x29, 0x28, 0xfa, 0x18, 0x76, 0x24, 0xcd, 0x89, + 0xe2, 0xb7, 0x34, 0x2d, 0x89, 0x5a, 0xd4, 0x63, 0xf0, 0x1b, 0xe5, 0x15, 0x51, 0x0b, 0x74, 0x04, + 0x7b, 0x8c, 0xab, 0x54, 0xcc, 0x7e, 0xa6, 0x73, 0x95, 0x66, 0x5c, 0xd2, 0xb9, 0x8e, 0x5f, 0xb7, + 0x8d, 0x18, 0x57, 0xb1, 0x31, 0x7d, 0xd3, 0x58, 0xd0, 0x19, 0x0c, 0xb5, 0x07, 0xc9, 0x15, 0x95, + 0x4b, 0xa2, 0xe8, 0x7d, 0x5f, 0x4e, 0xab, 0xb0, 0x3d, 0x6c, 0x1d, 0xf4, 0xf1, 0x33, 0xc6, 0xd5, + 0xb8, 0x81, 0xbd, 0x1b, 0x86, 0xd3, 0x4a, 0xd7, 0xc7, 0xb6, 0x07, 0x1e, 0x76, 0x6c, 0x7d, 0x6c, + 0x6b, 0xc4, 0xe8, 0x13, 0xf8, 0x1f, 0xcb, 0xd3, 0x52, 0x0a, 0x93, 0xc3, 0xb4, 0xd1, 0x33, 0xb0, + 0x1d, 0x96, 0x5f, 0x59, 0xad, 0xee, 0xe3, 0xb5, 0xd7, 0x73, 0x02, 0xf7, 0xb5, 0xd7, 0xeb, 0x06, + 0x3d, 0xec, 0x69, 0x58, 0xf4, 0xa7, 0x03, 0xfd, 0x33, 0xae, 0x4e, 0x45, 0x51, 0x70, 0x85, 0x76, + 0xc1, 0xe5, 0x99, 0x39, 0xc5, 0x3e, 0x76, 0x79, 0x86, 0x42, 0xe8, 0x56, 0x2b, 0x53, 0x92, 0x19, + 0x9d, 0x8f, 0x1b, 0x11, 0x21, 0xf0, 0x66, 0x22, 0xbb, 0x33, 0xd3, 0xf2, 0xb1, 0x79, 0xa3, 0xcf, + 0xa0, 0x43, 0x56, 0x6a, 0x21, 0xa4, 0x99, 0xcb, 0xe0, 0x78, 0xaf, 0xb9, 0x49, 0x1b, 0x7d, 0x6c, + 0x6c, 0xb8, 0xc6, 0xa0, 0x63, 0xe8, 0xcf, 0x8d, 0x5e, 0x51, 0x19, 0xb6, 0xff, 0xc5, 0x61, 0x03, + 0x43, 0xcf, 0x00, 0x4a, 0x22, 0xe9, 0x52, 0xa5, 0x3c, 0xab, 0xc2, 0x8e, 0x99, 0x5f, 0xdf, 0x6a, + 0xce, 0xb3, 0x0a, 0x3d, 0x85, 0xbe, 0x2e, 0x24, 0xad, 0xf8, 0x5b, 0x1a, 0x76, 0x87, 0xce, 0x41, + 0x0b, 0xf7, 0xb4, 0x62, 0xca, 0xdf, 0xd2, 0x68, 0x01, 0xfe, 0x76, 0x58, 0xdd, 0x81, 0xb9, 0x09, + 0xc7, 0x76, 0xa0, 0xdf, 0x68, 0x0f, 0xda, 0xb4, 0x20, 0x3c, 0xaf, 0xbb, 0xb5, 0x02, 0x1a, 0x81, + 0x97, 0x11, 0x45, 0x4d, 0xaf, 0x03, 0xcd, 0x34, 0x43, 0xf1, 0x51, 0x43, 0xf1, 0x51, 0xd2, 0x7c, + 0x03, 0xb0, 0xc1, 0x45, 0x11, 0xc0, 0xe4, 0x17, 0xae, 0xa6, 0x8a, 0xa8, 0x55, 0xa5, 0x63, 0xde, + 0x92, 0x7c, 0x65, 0x13, 0xb5, 0xb1, 0x15, 0xa2, 0x04, 0x3a, 0x27, 0x92, 0x2c, 0xe7, 0x8b, 0x47, + 0xeb, 0x78, 0x05, 0x3b, 0x35, 0x4b, 0x6d, 0xef, 0xa6, 0x9e, 0xc1, 0xf1, 0xff, 0x9b, 0xf9, 0xac, + 0x37, 0x86, 0x7d, 0x8b, 0xb3, 0x52, 0xf4, 0xbb, 0x03, 0xad, 0x84, 0xb0, 0x47, 0x63, 0xda, 0xdd, + 0xba, 0xeb, 0xdd, 0x3e, 0xc8, 0xd1, 0xfa, 0x4f, 0x39, 0xf4, 0x4d, 0x14, 0xb4, 0xaa, 0x08, 0xa3, + 0x66, 0xcd, 0x3e, 0x6e, 0x44, 0xcd, 0xb6, 0xfa, 0x69, 0x37, 0xd0, 0x36, 0x1b, 0x18, 0xd4, 0x3a, + 0xbd, 0x04, 0x7d, 0x22, 0x8a, 0x30, 0x46, 0xa5, 0x39, 0xe3, 0x7f, 0x3c, 0x11, 0x8b, 0x89, 0x6e, + 0xc0, 0xbb, 0xae, 0xa8, 0x44, 0xef, 0x41, 0x9b, 0xe5, 0xe9, 0xfa, 0x32, 0x3d, 0x96, 0x9f, 0x67, + 0xeb, 0x1e, 0xdd, 0xc7, 0xf6, 0xd7, 0xda, 0xde, 0xdf, 0x0b, 0x18, 0xb0, 0x3c, 0x5d, 0x55, 0x9a, + 0x62, 0x05, 0xad, 0x49, 0x0b, 0x2c, 0xbf, 0xae, 0x35, 0xd1, 0xd7, 0x00, 0x96, 0x78, 0x57, 0x42, + 0xe4, 0xe8, 0x18, 0x60, 0x8b, 0x6e, 0x8e, 0xa9, 0x13, 0x35, 0x75, 0x6e, 0x48, 0x87, 0xb7, 0x50, + 0x9f, 0x9e, 0x34, 0x11, 0x92, 0xbb, 0x92, 0xbe, 0xfb, 0x7d, 0x03, 0xe8, 0x9c, 0xc6, 0x17, 0x17, + 0xe7, 0x49, 0xe0, 0xa0, 0x1e, 0x78, 0x27, 0x6f, 0xe2, 0x93, 0xc0, 0xd5, 0xaf, 0x04, 0x4f, 0x26, + 0x41, 0x0b, 0x75, 0xa1, 0x95, 0x8c, 0xcf, 0x02, 0xef, 0x8b, 0x18, 0xba, 0xa2, 0x4c, 0x95, 0x0e, + 0xf0, 0xfc, 0xc1, 0x8d, 0x5d, 0x50, 0xb5, 0x10, 0x59, 0x5c, 0xea, 0xef, 0x67, 0x15, 0xfe, 0xf5, + 0xeb, 0x3d, 0xc2, 0x6c, 0x7f, 0xf5, 0x71, 0x47, 0x94, 0xba, 0x8c, 0x93, 0xa3, 0x9f, 0xb4, 0x39, + 0x27, 0xb3, 0xd1, 0x5c, 0x14, 0x87, 0xf6, 0xf9, 0xb9, 0x90, 0xec, 0xd0, 0x3a, 0xd9, 0x7f, 0xd4, + 0x21, 0x13, 0xb5, 0x5c, 0xce, 0x66, 0x1d, 0xa3, 0x7a, 0xf9, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, + 0xec, 0x10, 0xbf, 0x4b, 0xfd, 0x06, 0x00, 0x00, } diff --git a/proto/objectpool.proto b/proto/objectpool.proto index c0aedd55b..94b962c8e 100644 --- a/proto/objectpool.proto +++ b/proto/objectpool.proto @@ -11,6 +11,7 @@ service ObjectPoolService { option (op_type) = { op: MUTATOR target_repository_field: "1.1" + additional_repository_field: "2" }; } rpc DeleteObjectPool(DeleteObjectPoolRequest) returns (DeleteObjectPoolResponse) { @@ -24,13 +25,15 @@ service ObjectPoolService { rpc LinkRepositoryToObjectPool(LinkRepositoryToObjectPoolRequest) returns (LinkRepositoryToObjectPoolResponse) { option (op_type) = { op: MUTATOR - target_repository_field: "1.1" + target_repository_field: "2" + additional_repository_field: "1.1" }; } rpc UnlinkRepositoryFromObjectPool(UnlinkRepositoryFromObjectPoolRequest) returns (UnlinkRepositoryFromObjectPoolResponse) { option (op_type) = { op: MUTATOR target_repository_field: "1" + additional_repository_field: "2" }; } @@ -49,7 +52,8 @@ service ObjectPoolService { rpc FetchIntoObjectPool(FetchIntoObjectPoolRequest) returns (FetchIntoObjectPoolResponse) { option (op_type) = { op: MUTATOR - target_repository_field: "1" + target_repository_field: "2.1" + additional_repository_field: "1" }; } } @@ -57,7 +61,7 @@ service ObjectPoolService { // Creates an object pool from the repository. The client is responsible for // joining this pool later with this repository. message CreateObjectPoolRequest { - ObjectPool object_pool = 1; + ObjectPool object_pool = 1; // already specified as the target repo field Repository origin = 2; } message CreateObjectPoolResponse {} @@ -78,7 +82,7 @@ message LinkRepositoryToObjectPoolResponse {} // This RPC doesn't require the ObjectPool as it will remove the alternates file // from the pool participant. The caller is responsible no data loss occurs. message UnlinkRepositoryFromObjectPoolRequest { - Repository repository = 1; + Repository repository = 1; // already specified as the target repo field ObjectPool object_pool = 2; } message UnlinkRepositoryFromObjectPoolResponse {} diff --git a/proto/shared.proto b/proto/shared.proto index b4c3dbac4..439f1b906 100644 --- a/proto/shared.proto +++ b/proto/shared.proto @@ -15,19 +15,19 @@ message OperationMsg { } Operation op = 1; - + enum Scope { REPOSITORY = 0; SERVER = 1; STORAGE = 2; } - + // Scope level indicates what level an RPC interacts with a server: // - REPOSITORY: scoped to only a single repo // - SERVER: affects the entire server and potentially all repos // - STORAGE: scoped to a specific storage location and all repos within Scope scope_level = 2; - + // If this operation modifies a repository, this field will // specify the location of the Repository field within the // request message. The field is specified in an OID style @@ -42,6 +42,7 @@ message OperationMsg { // For example, the following OID refers to a target repo field // nested in a one-of field, both at field one: "1.1" string target_repository_field = 3; + string additional_repository_field = 4; } enum ObjectType { diff --git a/ruby/proto/gitaly/shared_pb.rb b/ruby/proto/gitaly/shared_pb.rb index 9b4294067..dd8ef3531 100644 --- a/ruby/proto/gitaly/shared_pb.rb +++ b/ruby/proto/gitaly/shared_pb.rb @@ -9,6 +9,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do optional :op, :enum, 1, "gitaly.OperationMsg.Operation" optional :scope_level, :enum, 2, "gitaly.OperationMsg.Scope" optional :target_repository_field, :string, 3 + optional :additional_repository_field, :string, 4 end add_enum "gitaly.OperationMsg.Operation" do value :UNKNOWN, 0 |