From c3fee48d54eddd411fd6bcb095845409b3050923 Mon Sep 17 00:00:00 2001 From: Eric Weber Date: Mon, 26 Jun 2023 14:52:38 -0500 Subject: [PATCH] Temporarily use personal branches of longhorn-engine and longhorn-instance-manager Signed-off-by: Eric Weber --- go.mod | 4 + go.sum | 8 +- .../longhorn-engine/pkg/meta/version.go | 4 +- .../pkg/replica/client/client.go | 12 +- .../proto/ptypes/controller.pb.go | 179 +++++----- .../proto/ptypes/controller.proto | 1 + .../proto/ptypes/interceptor.go | 84 +++++ .../pkg/client/proxy_backup.go | 48 ++- .../pkg/client/proxy_metrics.go | 8 +- .../pkg/client/proxy_replica.go | 27 +- .../pkg/client/proxy_snapshot.go | 63 +++- .../pkg/client/proxy_volume.go | 25 +- .../pkg/imrpc/proxy.pb.go | 331 ++++++++++-------- .../pkg/imrpc/proxy.proto | 6 +- .../pkg/meta/version.go | 2 +- vendor/modules.txt | 6 +- 16 files changed, 516 insertions(+), 292 deletions(-) create mode 100644 vendor/github.com/longhorn/longhorn-engine/proto/ptypes/interceptor.go diff --git a/go.mod b/go.mod index e2b5c5ec12..7e4ee03e08 100644 --- a/go.mod +++ b/go.mod @@ -195,3 +195,7 @@ require ( sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect sigs.k8s.io/yaml v1.3.0 // indirect ) + +replace github.com/longhorn/longhorn-engine => github.com/ejweber/longhorn-engine v0.0.0-20230719155844-7dd52065a622 + +replace github.com/longhorn/longhorn-instance-manager => github.com/ejweber/longhorn-instance-manager v0.0.0-20230719160325-eef39617282f diff --git a/go.sum b/go.sum index 7372d4eff9..16493c2d0d 100644 --- a/go.sum +++ b/go.sum @@ -172,6 +172,10 @@ github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3 github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustmop/soup v1.1.2-0.20190516214245-38228baa104e/go.mod h1:CgNC6SGbT+Xb8wGGvzilttZL1mc5sQ/5KkcxsZttMIk= +github.com/ejweber/longhorn-engine v0.0.0-20230719155844-7dd52065a622 h1:UmPUFFx1BxwaMD3SGmO7TLwnyr2g7QXyWw7rRMFLbZI= +github.com/ejweber/longhorn-engine v0.0.0-20230719155844-7dd52065a622/go.mod h1:g/dipfdkEwgu1WczQ7NIR2pncYOUacExQgFwwFMUvps= +github.com/ejweber/longhorn-instance-manager v0.0.0-20230719160325-eef39617282f h1:HT6bpm305/xK88KMl2RT1Sz7INd5nplR816HAbV+huU= +github.com/ejweber/longhorn-instance-manager v0.0.0-20230719160325-eef39617282f/go.mod h1:9scvW6I16BnN+13CYy/bskS8ehb61/PK/Mah+LRH6Sg= github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/emicklei/go-restful/v3 v3.8.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/emicklei/go-restful/v3 v3.9.0 h1:XwGDlfxEnQZzuopoqxwSEllNcCOM9DhhFyhFIIGKwxE= @@ -505,10 +509,6 @@ github.com/longhorn/go-iscsi-helper v0.0.0-20230529082528-4c3270590712 h1:IOBWtv github.com/longhorn/go-iscsi-helper v0.0.0-20230529082528-4c3270590712/go.mod h1:hxy8Ra38KtX4MFmXZRAZUpJZSYcaI1pmnWmKA3ICA2c= github.com/longhorn/go-spdk-helper v0.0.0-20230626041832-c611b61f6b36 h1:wUaSMEhkoB+ZFH1Bru5wgxrFruE4NDkl5bXXDVciqQY= github.com/longhorn/go-spdk-helper v0.0.0-20230626041832-c611b61f6b36/go.mod h1:XoGXOYHw1KW3qdvTSimwY+Anyg5cPl6EVkjXxS25Upg= -github.com/longhorn/longhorn-engine v1.4.0-rc1.0.20230627154646-d1d6d308d37a h1:uYsXL6lIAzNNrffkaLIXYUPuKjVoh0LvkNC19UfqO4s= -github.com/longhorn/longhorn-engine v1.4.0-rc1.0.20230627154646-d1d6d308d37a/go.mod h1:OOjKIyGpTxmZFWkn8N1G+H4pga0niuMgzrR/h5HUJNo= -github.com/longhorn/longhorn-instance-manager v1.4.0-rc1.0.20230627162235-cb966cd0f58a h1:EYQ4LGNr9oKHulqAJDdBvco01kN7lJTF20qOytw+DVA= -github.com/longhorn/longhorn-instance-manager v1.4.0-rc1.0.20230627162235-cb966cd0f58a/go.mod h1:SL/ePLcAYD2x7n4d4D5WoKABiuai1HEomHtULZpJU3w= github.com/longhorn/longhorn-share-manager v1.4.0-rc1.0.20230531125701-c996c5a415b6 h1:v+3TcQuWtUphsYWJ4Hr+PeEjEPHUVVOSnk1DMNSFI1E= github.com/longhorn/longhorn-share-manager v1.4.0-rc1.0.20230531125701-c996c5a415b6/go.mod h1:Kq3D8tu8J1SED7XiVM6Yco6qkizxCjVhYzR78bqhUUI= github.com/longhorn/longhorn-spdk-engine v0.0.0-20230627161406-64cb30ad3cf1 h1:xygJgcpxNqOAI1B7ri33RsTSMHr6QPod1TVuQQqHe/4= diff --git a/vendor/github.com/longhorn/longhorn-engine/pkg/meta/version.go b/vendor/github.com/longhorn/longhorn-engine/pkg/meta/version.go index 6cc061ec2f..ea4cbfb978 100644 --- a/vendor/github.com/longhorn/longhorn-engine/pkg/meta/version.go +++ b/vendor/github.com/longhorn/longhorn-engine/pkg/meta/version.go @@ -2,11 +2,11 @@ package meta const ( // CLIAPIVersion used to communicate with user e.g. longhorn-manager - CLIAPIVersion = 8 + CLIAPIVersion = 9 CLIAPIMinVersion = 3 // ControllerAPIVersion used to communicate with instance-manager - ControllerAPIVersion = 4 + ControllerAPIVersion = 5 ControllerAPIMinVersion = 3 // DataFormatVersion used by the Replica to store data diff --git a/vendor/github.com/longhorn/longhorn-engine/pkg/replica/client/client.go b/vendor/github.com/longhorn/longhorn-engine/pkg/replica/client/client.go index 80fd4480e7..0b7f374a03 100644 --- a/vendor/github.com/longhorn/longhorn-engine/pkg/replica/client/client.go +++ b/vendor/github.com/longhorn/longhorn-engine/pkg/replica/client/client.go @@ -51,6 +51,8 @@ type ReplicaClient struct { host string replicaServiceURL string syncAgentServiceURL string + volumeName string + instanceName string replicaServiceContext ReplicaServiceContext syncServiceContext SyncServiceContext @@ -62,7 +64,7 @@ func (c *ReplicaClient) Close() error { return nil } -func NewReplicaClient(address string) (*ReplicaClient, error) { +func NewReplicaClient(address, volumeName, instanceName string) (*ReplicaClient, error) { replicaServiceURL := util.GetGRPCAddress(address) host, strPort, err := net.SplitHostPort(replicaServiceURL) if err != nil { @@ -79,6 +81,8 @@ func NewReplicaClient(address string) (*ReplicaClient, error) { host: host, replicaServiceURL: replicaServiceURL, syncAgentServiceURL: syncAgentServiceURL, + volumeName: volumeName, + instanceName: instanceName, }, nil } @@ -86,7 +90,8 @@ func NewReplicaClient(address string) (*ReplicaClient, error) { // for the longhorn-manager which executes these command as binaries invocations func (c *ReplicaClient) getReplicaServiceClient() (ptypes.ReplicaServiceClient, error) { err := c.replicaServiceContext.once.Do(func() error { - cc, err := grpc.Dial(c.replicaServiceURL, grpc.WithInsecure()) + cc, err := grpc.Dial(c.replicaServiceURL, grpc.WithInsecure(), + ptypes.WithIdentityValidationClientInterceptor(c.volumeName, c.instanceName)) if err != nil { return err } @@ -106,7 +111,8 @@ func (c *ReplicaClient) getReplicaServiceClient() (ptypes.ReplicaServiceClient, // for the longhorn-manager which executes these command as binaries invocations func (c *ReplicaClient) getSyncServiceClient() (ptypes.SyncAgentServiceClient, error) { err := c.syncServiceContext.once.Do(func() error { - cc, err := grpc.Dial(c.syncAgentServiceURL, grpc.WithInsecure()) + cc, err := grpc.Dial(c.syncAgentServiceURL, grpc.WithInsecure(), + ptypes.WithIdentityValidationClientInterceptor(c.volumeName, c.instanceName)) if err != nil { return err } diff --git a/vendor/github.com/longhorn/longhorn-engine/proto/ptypes/controller.pb.go b/vendor/github.com/longhorn/longhorn-engine/proto/ptypes/controller.pb.go index fb8d22a909..b3d9725536 100644 --- a/vendor/github.com/longhorn/longhorn-engine/proto/ptypes/controller.pb.go +++ b/vendor/github.com/longhorn/longhorn-engine/proto/ptypes/controller.pb.go @@ -166,6 +166,7 @@ func (m *Volume) GetUnmapMarkSnapChainRemoved() bool { type ReplicaAddress struct { Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` + InstanceName string `protobuf:"bytes,2,opt,name=instanceName,proto3" json:"instanceName,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -203,6 +204,13 @@ func (m *ReplicaAddress) GetAddress() string { return "" } +func (m *ReplicaAddress) GetInstanceName() string { + if m != nil { + return m.InstanceName + } + return "" +} + type ControllerReplica struct { Address *ReplicaAddress `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` Mode ReplicaMode `protobuf:"varint,2,opt,name=mode,proto3,enum=ptypes.ReplicaMode" json:"mode,omitempty"` @@ -1097,91 +1105,92 @@ func init() { func init() { proto.RegisterFile("controller.proto", fileDescriptor_ed7f10298fa1d90f) } var fileDescriptor_ed7f10298fa1d90f = []byte{ - // 1344 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0x4d, 0x6f, 0xdb, 0x46, - 0x13, 0x7e, 0xf5, 0x61, 0xc9, 0x1a, 0x39, 0x8e, 0xb2, 0xb1, 0x13, 0x46, 0x79, 0x53, 0x08, 0x44, - 0x91, 0xca, 0x6e, 0xa1, 0xa4, 0x0a, 0x8a, 0x3a, 0xfd, 0x40, 0x62, 0x38, 0x72, 0xaa, 0xc2, 0x46, - 0x02, 0xaa, 0x49, 0x2e, 0x05, 0x84, 0xb5, 0xb8, 0xb2, 0x17, 0x21, 0x97, 0xcc, 0x72, 0xe9, 0x54, - 0xbd, 0xf5, 0xd4, 0x6b, 0x4f, 0xfd, 0x0f, 0xfd, 0x37, 0xbd, 0xf7, 0xcf, 0x14, 0xfb, 0x41, 0x8a, - 0xa4, 0x44, 0x27, 0x3d, 0x89, 0xfb, 0xcc, 0x33, 0xb3, 0xb3, 0xb3, 0x33, 0xfb, 0x08, 0x3a, 0xb3, - 0x80, 0x09, 0x1e, 0x78, 0x1e, 0xe1, 0x83, 0x90, 0x07, 0x22, 0x40, 0x8d, 0x50, 0x2c, 0x42, 0x12, - 0x75, 0xef, 0x9e, 0x07, 0xc1, 0xb9, 0x47, 0x1e, 0x28, 0xf4, 0x2c, 0x9e, 0x3f, 0x20, 0x7e, 0x28, - 0x16, 0x9a, 0xd4, 0xdd, 0x9a, 0x05, 0xbe, 0x1f, 0x30, 0xbd, 0xb2, 0x7f, 0xab, 0x41, 0xe3, 0x75, - 0xe0, 0xc5, 0x3e, 0x41, 0x08, 0xea, 0x0c, 0xfb, 0xc4, 0xaa, 0xf4, 0x2a, 0xfd, 0x96, 0xa3, 0xbe, - 0x25, 0x16, 0xd1, 0x5f, 0x89, 0x55, 0xed, 0x55, 0xfa, 0x35, 0x47, 0x7d, 0x23, 0x1b, 0xb6, 0x38, - 0x09, 0x3d, 0x3a, 0xc3, 0x47, 0x41, 0xcc, 0x84, 0x55, 0xeb, 0x55, 0xfa, 0x1b, 0x4e, 0x0e, 0x43, - 0x5d, 0xd8, 0x24, 0xcc, 0x0d, 0x03, 0xca, 0x84, 0x55, 0x57, 0xf1, 0xd2, 0xb5, 0xb4, 0xcd, 0x79, - 0xc0, 0x04, 0x61, 0xae, 0xb5, 0xa1, 0x6d, 0xc9, 0x1a, 0x7d, 0x0a, 0xd7, 0x92, 0xef, 0x89, 0xc0, - 0x82, 0x58, 0x0d, 0x45, 0xc8, 0x83, 0xa8, 0x07, 0x6d, 0x1a, 0x8d, 0x7e, 0x09, 0x31, 0x73, 0x29, - 0x3b, 0xb7, 0x9a, 0xbd, 0x4a, 0x7f, 0xd3, 0xc9, 0x42, 0xe8, 0x21, 0xec, 0x78, 0x38, 0x12, 0x53, - 0x22, 0x91, 0x88, 0x06, 0x6c, 0x4a, 0x38, 0x0f, 0xb8, 0xb5, 0xa9, 0xc2, 0x21, 0x69, 0x1b, 0x25, - 0xa6, 0x91, 0xb4, 0xa0, 0xaf, 0xc1, 0x2a, 0x78, 0xcc, 0x31, 0xf5, 0x88, 0x3b, 0xc5, 0xc2, 0x6a, - 0x29, 0xaf, 0xdd, 0x9c, 0xd7, 0xb1, 0xb2, 0x1e, 0x0a, 0xf4, 0x14, 0xee, 0xc5, 0xcc, 0xc7, 0xe1, - 0xd4, 0xc7, 0xfc, 0xed, 0x34, 0x62, 0x38, 0x9c, 0xce, 0x2e, 0x30, 0x65, 0x53, 0x4e, 0xfc, 0xe0, - 0x92, 0xb8, 0x16, 0xa8, 0xf4, 0xee, 0x28, 0xd2, 0x29, 0xe6, 0x6f, 0x27, 0x0c, 0x87, 0x47, 0x92, - 0xe1, 0x68, 0x82, 0xbd, 0x0f, 0xdb, 0x8e, 0x2e, 0xde, 0xa1, 0xeb, 0x72, 0x12, 0x45, 0xc8, 0x82, - 0x26, 0xd6, 0x9f, 0xe6, 0x36, 0x92, 0xa5, 0xcd, 0xe0, 0xc6, 0x51, 0x7a, 0xed, 0xc6, 0x0b, 0x3d, - 0xcc, 0xd3, 0xdb, 0xc3, 0x5b, 0x03, 0xdd, 0x09, 0x83, 0x7c, 0xdc, 0x34, 0x0c, 0xfa, 0x0c, 0xea, - 0x7e, 0xe0, 0xea, 0x7b, 0xdd, 0x1e, 0xde, 0x2c, 0xd0, 0x4f, 0x03, 0x97, 0x38, 0x8a, 0x60, 0x5f, - 0x02, 0xd2, 0xed, 0x31, 0x11, 0x98, 0x0b, 0x87, 0xbc, 0x8b, 0x49, 0x24, 0xd0, 0x3e, 0x74, 0x78, - 0x2e, 0x32, 0x91, 0x3b, 0xd7, 0xfa, 0x2d, 0x67, 0x05, 0x5f, 0xdb, 0x42, 0x3d, 0x68, 0xcf, 0x62, - 0xce, 0x09, 0x13, 0x13, 0x69, 0xaa, 0x29, 0x53, 0x16, 0xb2, 0xff, 0xaa, 0xc0, 0xae, 0xd9, 0x98, - 0xe1, 0x30, 0xba, 0x08, 0xd2, 0xbd, 0xd7, 0xb5, 0xe9, 0x21, 0x34, 0x3c, 0x7c, 0x46, 0xbc, 0xc8, - 0xaa, 0xf6, 0x6a, 0xfd, 0xf6, 0x70, 0x2f, 0x39, 0xd0, 0xda, 0x10, 0x83, 0x13, 0xc5, 0x1d, 0x31, - 0xc1, 0x17, 0x8e, 0x71, 0xec, 0x3e, 0x86, 0x76, 0x06, 0x46, 0x1d, 0xa8, 0xbd, 0x25, 0x0b, 0xb3, - 0x89, 0xfc, 0x44, 0x3b, 0xb0, 0x71, 0x89, 0xbd, 0x58, 0x1f, 0xa4, 0xe5, 0xe8, 0xc5, 0x37, 0xd5, - 0x83, 0x8a, 0xbd, 0x07, 0x37, 0x8b, 0xfb, 0x84, 0xde, 0x62, 0x5d, 0xa2, 0x4b, 0xaa, 0x43, 0x2e, - 0x09, 0xbf, 0xea, 0x4c, 0x4b, 0xaa, 0xee, 0xea, 0x0c, 0x55, 0x95, 0xb3, 0xb2, 0x2c, 0xa7, 0x7d, - 0x00, 0x5d, 0x4d, 0x3d, 0x5e, 0x8e, 0xc9, 0x32, 0x78, 0x76, 0xde, 0x2a, 0xf9, 0x79, 0xb3, 0x47, - 0xb0, 0xa7, 0x3d, 0x5f, 0x95, 0x75, 0xe7, 0x84, 0xa4, 0x81, 0x2c, 0x68, 0x12, 0x86, 0xcf, 0x3c, - 0xa2, 0xe3, 0x6c, 0x3a, 0xc9, 0xd2, 0x3e, 0x84, 0xbb, 0x3a, 0xcc, 0x4b, 0x4e, 0x42, 0xcc, 0x89, - 0x43, 0x22, 0x11, 0xc8, 0x1f, 0xed, 0x68, 0xc3, 0x96, 0x9c, 0x1d, 0x83, 0x26, 0x59, 0xe4, 0x30, - 0xfb, 0x38, 0x3d, 0x03, 0x65, 0x34, 0xba, 0x28, 0x44, 0xe8, 0xc3, 0x75, 0xd3, 0x1d, 0x85, 0x20, - 0x45, 0xd8, 0x1e, 0x43, 0xc7, 0x74, 0xf1, 0x09, 0x8d, 0xcc, 0x4d, 0x7c, 0x05, 0x9b, 0xa6, 0x2d, - 0x75, 0x9b, 0xb6, 0x87, 0x77, 0x92, 0x06, 0x59, 0x19, 0x26, 0x27, 0xa5, 0xda, 0x7f, 0x54, 0xe0, - 0x93, 0x15, 0xfb, 0x11, 0x27, 0x58, 0x90, 0x4c, 0x49, 0xd6, 0x0f, 0x2a, 0xfa, 0x1c, 0x6e, 0x44, - 0xa6, 0x1d, 0xa6, 0x9c, 0xbc, 0x8b, 0xa9, 0xcc, 0xb9, 0xaa, 0xca, 0xd6, 0x89, 0x32, 0xfd, 0x28, - 0xf1, 0x74, 0x1c, 0x6b, 0x1f, 0x1a, 0xc7, 0x3f, 0x2b, 0xd0, 0x35, 0x68, 0x5a, 0xea, 0xb3, 0x98, - 0x7a, 0xae, 0x3e, 0xe8, 0x23, 0x68, 0x9a, 0xec, 0xcd, 0x43, 0x70, 0xc5, 0x39, 0x13, 0x26, 0x3a, - 0x82, 0x9b, 0xd1, 0x82, 0xcd, 0xa6, 0x73, 0xea, 0x91, 0x29, 0x65, 0xf3, 0x60, 0xea, 0xd1, 0x48, - 0x98, 0x49, 0xda, 0x49, 0x02, 0x4c, 0x16, 0x6c, 0x76, 0x4c, 0x3d, 0x32, 0x66, 0xf3, 0xc0, 0xe9, - 0x44, 0x99, 0x95, 0xac, 0xb3, 0xbd, 0x0f, 0xe8, 0xc7, 0x20, 0xe6, 0x0c, 0x7b, 0xba, 0xec, 0xba, - 0x3c, 0x3b, 0xb0, 0xe1, 0x51, 0x9f, 0x0a, 0xd3, 0xad, 0x7a, 0x61, 0xff, 0x5e, 0x83, 0x6b, 0xaf, - 0x09, 0x97, 0xaf, 0xe8, 0x8b, 0x58, 0x84, 0xb1, 0x2a, 0xe3, 0xa5, 0x06, 0x92, 0x32, 0x9a, 0x25, - 0xfa, 0x3f, 0xb4, 0xce, 0xa9, 0x38, 0x0a, 0x7c, 0x19, 0x45, 0x4f, 0xde, 0x12, 0x90, 0x56, 0x75, - 0xfa, 0x67, 0x52, 0x2a, 0x6a, 0xda, 0x9a, 0x02, 0x52, 0x4c, 0x66, 0x1e, 0x3d, 0x7c, 0x39, 0x36, - 0x9b, 0x29, 0x25, 0xaa, 0x39, 0x79, 0x50, 0xbe, 0x65, 0x1a, 0x38, 0xa5, 0x2c, 0x21, 0x6e, 0x28, - 0xe2, 0x0a, 0x8e, 0x86, 0xb0, 0xb3, 0x14, 0xdd, 0x4c, 0xe0, 0x86, 0xe2, 0xaf, 0xb5, 0xa1, 0x03, - 0xb8, 0x9d, 0xc3, 0x33, 0xdb, 0x34, 0x95, 0x5b, 0x99, 0x19, 0x7d, 0x01, 0x37, 0x5c, 0x2c, 0xf0, - 0x71, 0xc0, 0x7d, 0x2c, 0x12, 0x9f, 0x4d, 0xe5, 0xb3, 0x6a, 0x90, 0xb9, 0x2d, 0xc1, 0xcc, 0x26, - 0x2d, 0x9d, 0xdb, 0x3a, 0x9b, 0xfd, 0x03, 0xec, 0x9a, 0xcf, 0x67, 0x44, 0x60, 0xea, 0x3d, 0x27, - 0x66, 0x62, 0x1e, 0xe4, 0x2f, 0xa4, 0x3d, 0xdc, 0x4d, 0x5f, 0xd4, 0xec, 0xc5, 0xa5, 0xf7, 0x64, - 0xff, 0x53, 0x81, 0xe6, 0x29, 0x11, 0x9c, 0xce, 0x22, 0x74, 0x1f, 0xb6, 0x39, 0xc1, 0xee, 0x4f, - 0x17, 0x3c, 0x88, 0xcf, 0x2f, 0xc2, 0x58, 0x5f, 0x7f, 0xdd, 0x29, 0xa0, 0x72, 0xa8, 0xdf, 0x73, - 0x2a, 0x48, 0x86, 0x58, 0x55, 0xc4, 0x22, 0x2c, 0xf5, 0x42, 0xfa, 0x9e, 0x60, 0x41, 0xd8, 0x6c, - 0xa1, 0x6e, 0xba, 0xee, 0x64, 0x21, 0xf9, 0xc4, 0x28, 0xa7, 0x84, 0x52, 0x57, 0x94, 0x1c, 0x26, - 0x1f, 0x42, 0xe9, 0x32, 0x7e, 0xf1, 0x72, 0xa2, 0x6e, 0xb8, 0xee, 0xa4, 0x6b, 0xd9, 0x49, 0x8a, - 0xab, 0x8c, 0x0d, 0x65, 0x5c, 0x02, 0xf6, 0x77, 0x70, 0xdd, 0x1c, 0x2e, 0xad, 0xd0, 0x1e, 0x34, - 0x7d, 0x0d, 0x99, 0x0a, 0x5d, 0x4f, 0x2a, 0x64, 0x98, 0x4e, 0x62, 0xdf, 0xbf, 0x0f, 0xed, 0xcc, - 0x24, 0xa3, 0x06, 0x54, 0xdf, 0xbc, 0xe8, 0xfc, 0x4f, 0xfe, 0x3a, 0x6f, 0x3a, 0x15, 0xd4, 0x84, - 0xda, 0xc8, 0x71, 0x3a, 0xd5, 0xe1, 0xdf, 0x90, 0x15, 0xf7, 0x09, 0xe1, 0x97, 0x74, 0x46, 0xd0, - 0x23, 0x68, 0xe9, 0x87, 0xf1, 0x39, 0x11, 0xe8, 0xd6, 0x40, 0xff, 0xb5, 0x1b, 0x24, 0x7f, 0xed, - 0x06, 0x23, 0xf9, 0xd7, 0xae, 0xbb, 0x9d, 0x17, 0x3c, 0xf4, 0x18, 0xda, 0x19, 0xd9, 0x46, 0xdd, - 0x82, 0x1e, 0x66, 0xe4, 0x61, 0xc5, 0xf5, 0x00, 0xb6, 0x0d, 0xeb, 0x22, 0x16, 0x6e, 0xf0, 0x9e, - 0x7d, 0xf4, 0xa6, 0x27, 0xa9, 0xa7, 0x79, 0xdf, 0xd0, 0xbd, 0x2b, 0x75, 0xb8, 0x7b, 0xb7, 0xcc, - 0x2c, 0x0b, 0xfc, 0x2d, 0x6c, 0x65, 0xa5, 0x12, 0x15, 0xc8, 0x39, 0x01, 0x5d, 0x49, 0x25, 0x75, - 0xd6, 0xe2, 0x59, 0x74, 0xce, 0x49, 0xea, 0x8a, 0xf3, 0x38, 0x51, 0xde, 0x9c, 0x9c, 0x22, 0x3b, - 0x4f, 0x5b, 0xa7, 0xb5, 0x2b, 0xa1, 0x9e, 0xc2, 0xad, 0x02, 0xfb, 0xbf, 0x16, 0xf5, 0x1c, 0xec, - 0x0f, 0x2b, 0x34, 0xfa, 0x32, 0xef, 0xf5, 0x11, 0x6a, 0xbe, 0xb2, 0xd1, 0x93, 0xb4, 0x4b, 0xe5, - 0x0b, 0x5e, 0x9a, 0x9f, 0x55, 0x10, 0xa7, 0xa5, 0xca, 0x3e, 0x01, 0x30, 0x98, 0xee, 0xd4, 0xb5, - 0x7f, 0x41, 0xbb, 0xe5, 0x8a, 0x84, 0x7e, 0x86, 0xdb, 0x25, 0x72, 0x8b, 0xee, 0x97, 0x7a, 0xe5, - 0xf4, 0xf8, 0xaa, 0xe8, 0x4f, 0xe0, 0x9a, 0xf9, 0x7c, 0x46, 0x3c, 0x22, 0x48, 0x69, 0x86, 0x25, - 0x27, 0x47, 0xa3, 0x34, 0xc0, 0xab, 0xd0, 0x95, 0x49, 0x95, 0x6f, 0x76, 0x55, 0x1e, 0x13, 0xd8, - 0x5d, 0xab, 0xe0, 0xa5, 0xf9, 0xd8, 0x05, 0x7c, 0x9d, 0xf0, 0x8f, 0x61, 0xc7, 0x58, 0x5f, 0x13, - 0x4e, 0xe7, 0x8b, 0x0f, 0xc5, 0xbc, 0x22, 0xbf, 0x43, 0x68, 0x67, 0x94, 0x7c, 0xf9, 0x74, 0xac, - 0xca, 0x7b, 0x69, 0xa5, 0xc6, 0xd0, 0x29, 0xca, 0x4a, 0x69, 0x3f, 0xdd, 0x2b, 0x08, 0x4b, 0x41, - 0x88, 0xbe, 0x07, 0x58, 0xbe, 0xbc, 0xa5, 0x41, 0x6e, 0x17, 0xde, 0xde, 0xc4, 0xfd, 0xac, 0xa1, - 0x88, 0x8f, 0xfe, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x74, 0x4e, 0x8a, 0x3a, 0x2c, 0x0f, 0x00, 0x00, + // 1356 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0x5d, 0x6f, 0x13, 0x47, + 0x17, 0x7e, 0x6d, 0x27, 0x76, 0x72, 0x1c, 0x82, 0x19, 0x12, 0x58, 0xcc, 0x4b, 0x65, 0xad, 0x2a, + 0xea, 0xd0, 0xca, 0x50, 0xa3, 0xaa, 0xa1, 0x1f, 0x82, 0x28, 0x38, 0xd4, 0x55, 0x02, 0x68, 0x5d, + 0xe0, 0xa6, 0x92, 0x35, 0xf1, 0x8e, 0x93, 0x11, 0xeb, 0x99, 0x65, 0x76, 0x36, 0xd4, 0xbd, 0xeb, + 0x55, 0x6f, 0x7b, 0xd5, 0xff, 0xd0, 0x7f, 0xd3, 0xfb, 0xfe, 0x99, 0x6a, 0x3e, 0x76, 0xbd, 0xbb, + 0xf6, 0x06, 0x7a, 0xe5, 0x9d, 0xe7, 0x3c, 0xe7, 0x63, 0xce, 0x9c, 0x99, 0xc7, 0xd0, 0x9a, 0x70, + 0x26, 0x05, 0x0f, 0x02, 0x22, 0x7a, 0xa1, 0xe0, 0x92, 0xa3, 0x7a, 0x28, 0xe7, 0x21, 0x89, 0xda, + 0xb7, 0xcf, 0x38, 0x3f, 0x0b, 0xc8, 0x7d, 0x8d, 0x9e, 0xc6, 0xd3, 0xfb, 0x64, 0x16, 0xca, 0xb9, + 0x21, 0xb5, 0xb7, 0x26, 0x7c, 0x36, 0xe3, 0xcc, 0xac, 0xdc, 0xdf, 0x6a, 0x50, 0x7f, 0xcd, 0x83, + 0x78, 0x46, 0x10, 0x82, 0x35, 0x86, 0x67, 0xc4, 0xa9, 0x74, 0x2a, 0xdd, 0x4d, 0x4f, 0x7f, 0x2b, + 0x2c, 0xa2, 0xbf, 0x12, 0xa7, 0xda, 0xa9, 0x74, 0x6b, 0x9e, 0xfe, 0x46, 0x2e, 0x6c, 0x09, 0x12, + 0x06, 0x74, 0x82, 0x0f, 0x79, 0xcc, 0xa4, 0x53, 0xeb, 0x54, 0xba, 0xeb, 0x5e, 0x0e, 0x43, 0x6d, + 0xd8, 0x20, 0xcc, 0x0f, 0x39, 0x65, 0xd2, 0x59, 0xd3, 0xf1, 0xd2, 0xb5, 0xb2, 0x4d, 0x05, 0x67, + 0x92, 0x30, 0xdf, 0x59, 0x37, 0xb6, 0x64, 0x8d, 0x3e, 0x85, 0x2b, 0xc9, 0xf7, 0x48, 0x62, 0x49, + 0x9c, 0xba, 0x26, 0xe4, 0x41, 0xd4, 0x81, 0x26, 0x8d, 0x06, 0xbf, 0x84, 0x98, 0xf9, 0x94, 0x9d, + 0x39, 0x8d, 0x4e, 0xa5, 0xbb, 0xe1, 0x65, 0x21, 0xf4, 0x00, 0x76, 0x02, 0x1c, 0xc9, 0x31, 0x51, + 0x48, 0x44, 0x39, 0x1b, 0x13, 0x21, 0xb8, 0x70, 0x36, 0x74, 0x38, 0xa4, 0x6c, 0x83, 0xc4, 0x34, + 0x50, 0x16, 0xf4, 0x35, 0x38, 0x05, 0x8f, 0x29, 0xa6, 0x01, 0xf1, 0xc7, 0x58, 0x3a, 0x9b, 0xda, + 0x6b, 0x37, 0xe7, 0x75, 0xa4, 0xad, 0x07, 0x12, 0x3d, 0x81, 0x3b, 0x31, 0x9b, 0xe1, 0x70, 0x3c, + 0xc3, 0xe2, 0xed, 0x38, 0x62, 0x38, 0x1c, 0x4f, 0xce, 0x31, 0x65, 0x63, 0x41, 0x66, 0xfc, 0x82, + 0xf8, 0x0e, 0xe8, 0xf2, 0x6e, 0x69, 0xd2, 0x09, 0x16, 0x6f, 0x47, 0x0c, 0x87, 0x87, 0x8a, 0xe1, + 0x19, 0x82, 0xfb, 0x1c, 0xb6, 0x3d, 0xd3, 0xbc, 0x03, 0xdf, 0x17, 0x24, 0x8a, 0x90, 0x03, 0x0d, + 0x6c, 0x3e, 0xed, 0x69, 0x24, 0x4b, 0xd5, 0x7c, 0xca, 0x22, 0x89, 0xd9, 0x84, 0x3c, 0x57, 0x87, + 0x55, 0xd5, 0xe6, 0x1c, 0xe6, 0x32, 0xb8, 0x76, 0x98, 0x8e, 0x86, 0x8d, 0x8c, 0x1e, 0xe4, 0x43, + 0x36, 0xfb, 0x37, 0x7a, 0x66, 0x5a, 0x7a, 0xf9, 0xdc, 0x8b, 0x54, 0x9f, 0xc1, 0xda, 0x8c, 0xfb, + 0x26, 0xc5, 0x76, 0xff, 0x7a, 0x81, 0x7e, 0xc2, 0x7d, 0xe2, 0x69, 0x82, 0x7b, 0x01, 0xc8, 0x8c, + 0xd0, 0x48, 0x62, 0x21, 0x3d, 0xf2, 0x2e, 0x26, 0x91, 0x44, 0xf7, 0xa0, 0x25, 0x72, 0x91, 0x89, + 0xca, 0x5c, 0xeb, 0x6e, 0x7a, 0x4b, 0xf8, 0xca, 0x31, 0xeb, 0x40, 0x73, 0x12, 0x0b, 0x41, 0x98, + 0x1c, 0x29, 0x53, 0x4d, 0x9b, 0xb2, 0x90, 0xfb, 0x57, 0x05, 0x76, 0x6d, 0x62, 0x86, 0xc3, 0xe8, + 0x9c, 0xa7, 0xb9, 0x57, 0x8d, 0xf2, 0x01, 0xd4, 0x03, 0x7c, 0x4a, 0x82, 0xc8, 0xa9, 0x76, 0x6a, + 0xdd, 0x66, 0x7f, 0x2f, 0xd9, 0xd0, 0xca, 0x10, 0xbd, 0x63, 0xcd, 0x1d, 0x30, 0x29, 0xe6, 0x9e, + 0x75, 0x6c, 0x3f, 0x82, 0x66, 0x06, 0x46, 0x2d, 0xa8, 0xbd, 0x25, 0x73, 0x9b, 0x44, 0x7d, 0xa2, + 0x1d, 0x58, 0xbf, 0xc0, 0x41, 0x9c, 0x1c, 0x8b, 0x59, 0x7c, 0x53, 0xdd, 0xaf, 0xb8, 0x7b, 0x70, + 0xbd, 0x98, 0x27, 0x0c, 0xe6, 0xab, 0x0a, 0x5d, 0x50, 0x3d, 0x72, 0x41, 0xc4, 0x65, 0x7b, 0x5a, + 0x50, 0xcd, 0xe4, 0x67, 0xa8, 0xba, 0x9d, 0x95, 0x45, 0x3b, 0xdd, 0x7d, 0x68, 0x1b, 0xea, 0xd1, + 0xe2, 0x2a, 0x2d, 0x82, 0x67, 0xef, 0x64, 0x25, 0x7f, 0x27, 0xdd, 0x01, 0xec, 0x19, 0xcf, 0x57, + 0x65, 0x13, 0x3c, 0x22, 0x69, 0x20, 0x07, 0x1a, 0x84, 0xe1, 0xd3, 0x80, 0x98, 0x38, 0x1b, 0x5e, + 0xb2, 0x74, 0x0f, 0xe0, 0xb6, 0x09, 0xf3, 0x52, 0x90, 0x10, 0x0b, 0xe2, 0x91, 0x48, 0x72, 0xf5, + 0x63, 0x1c, 0x5d, 0xd8, 0x52, 0xf7, 0xcb, 0xa2, 0x49, 0x15, 0x39, 0xcc, 0x3d, 0x4a, 0xf7, 0x40, + 0x19, 0x8d, 0xce, 0x0b, 0x11, 0xba, 0x70, 0xd5, 0x4e, 0x47, 0x21, 0x48, 0x11, 0x76, 0x87, 0xd0, + 0xb2, 0x53, 0x7c, 0x4c, 0x23, 0x7b, 0x12, 0x5f, 0xc1, 0x86, 0x1d, 0x4b, 0x33, 0xa6, 0xcd, 0xfe, + 0xad, 0x64, 0x40, 0x96, 0x2e, 0x93, 0x97, 0x52, 0xdd, 0x3f, 0x2a, 0xf0, 0xc9, 0x92, 0xfd, 0x50, + 0x10, 0x2c, 0x49, 0xa6, 0x25, 0x25, 0x97, 0xf9, 0x73, 0xb8, 0x16, 0xd9, 0x71, 0x18, 0x0b, 0xf2, + 0x2e, 0xa6, 0xaa, 0xe6, 0xaa, 0x6e, 0x5b, 0x2b, 0xca, 0xcc, 0xa3, 0xc2, 0xd3, 0xeb, 0x58, 0xfb, + 0xd0, 0x75, 0xfc, 0xb3, 0x02, 0x6d, 0x8b, 0xa6, 0xad, 0x3e, 0x8d, 0x69, 0xe0, 0x9b, 0x8d, 0x3e, + 0x84, 0x86, 0xad, 0xde, 0x3e, 0x04, 0x97, 0xec, 0x33, 0x61, 0xa2, 0x43, 0xb8, 0x1e, 0xcd, 0xd9, + 0x64, 0x3c, 0xa5, 0x01, 0x19, 0x53, 0x36, 0xe5, 0xe3, 0x80, 0x46, 0xd2, 0xde, 0xa4, 0x9d, 0x24, + 0xc0, 0x68, 0xce, 0x26, 0x47, 0x34, 0x20, 0x43, 0x36, 0xe5, 0x5e, 0x2b, 0xca, 0xac, 0x54, 0x9f, + 0xdd, 0x7b, 0x80, 0x7e, 0xe4, 0xb1, 0x60, 0x38, 0x30, 0x6d, 0x37, 0xed, 0xd9, 0x81, 0xf5, 0x80, + 0xce, 0xa8, 0xb4, 0xd3, 0x6a, 0x16, 0xee, 0xef, 0x35, 0xb8, 0xf2, 0x9a, 0x08, 0xf5, 0xd2, 0xbe, + 0x88, 0x65, 0x18, 0xeb, 0x36, 0x5e, 0x18, 0x20, 0x69, 0xa3, 0x5d, 0xa2, 0xff, 0xc3, 0xe6, 0x19, + 0x95, 0x87, 0x7c, 0xa6, 0xa2, 0x98, 0x9b, 0xb7, 0x00, 0x94, 0x55, 0xef, 0xfe, 0xa9, 0x92, 0x93, + 0x9a, 0xb1, 0xa6, 0x80, 0x12, 0x9c, 0x49, 0x40, 0x0f, 0x5e, 0x0e, 0x6d, 0x32, 0xad, 0x56, 0x35, + 0x2f, 0x0f, 0xaa, 0xb7, 0xcc, 0x00, 0x27, 0x94, 0x25, 0xc4, 0x75, 0x4d, 0x5c, 0xc2, 0x51, 0x1f, + 0x76, 0x16, 0xc2, 0x9c, 0x09, 0x5c, 0xd7, 0xfc, 0x95, 0x36, 0xb4, 0x0f, 0x37, 0x73, 0x78, 0x26, + 0x4d, 0x43, 0xbb, 0x95, 0x99, 0xd1, 0x17, 0x70, 0xcd, 0xc7, 0x12, 0x1f, 0x71, 0x31, 0xc3, 0x32, + 0xf1, 0xd9, 0xd0, 0x3e, 0xcb, 0x06, 0x55, 0xdb, 0x02, 0xcc, 0x24, 0xd9, 0x34, 0xb5, 0xad, 0xb2, + 0xb9, 0x3f, 0xc0, 0xae, 0xfd, 0x7c, 0x4a, 0x24, 0xa6, 0xc1, 0x33, 0x62, 0x6f, 0xcc, 0xfd, 0xfc, + 0x81, 0x34, 0xfb, 0xbb, 0xe9, 0x8b, 0x9a, 0x3d, 0xb8, 0xf4, 0x9c, 0xdc, 0x7f, 0x2a, 0xd0, 0x38, + 0x21, 0x52, 0xd0, 0x49, 0x84, 0xee, 0xc2, 0xb6, 0x20, 0xd8, 0xff, 0xe9, 0x5c, 0xf0, 0xf8, 0xec, + 0x3c, 0x8c, 0xcd, 0xf1, 0xaf, 0x79, 0x05, 0x54, 0x5d, 0xea, 0xf7, 0x82, 0x4a, 0x92, 0x21, 0x56, + 0x35, 0xb1, 0x08, 0x2b, 0xbd, 0x50, 0xbe, 0xc7, 0x58, 0x12, 0x36, 0x99, 0xeb, 0x93, 0x5e, 0xf3, + 0xb2, 0x90, 0x7a, 0x62, 0xb4, 0x53, 0x42, 0x59, 0xd3, 0x94, 0x1c, 0xa6, 0x1e, 0x42, 0xe5, 0x32, + 0x7c, 0xf1, 0x72, 0xa4, 0x4f, 0x78, 0xcd, 0x4b, 0xd7, 0x6a, 0x92, 0x34, 0x57, 0x1b, 0xeb, 0xda, + 0xb8, 0x00, 0xdc, 0xef, 0xe0, 0xaa, 0xdd, 0x5c, 0xda, 0xa1, 0x3d, 0x68, 0xcc, 0x0c, 0x64, 0x3b, + 0x74, 0x35, 0xe9, 0x90, 0x65, 0x7a, 0x89, 0xfd, 0xde, 0x5d, 0x68, 0x66, 0x6e, 0x32, 0xaa, 0x43, + 0xf5, 0xcd, 0x8b, 0xd6, 0xff, 0xd4, 0xaf, 0xf7, 0xa6, 0x55, 0x41, 0x0d, 0xa8, 0x0d, 0x3c, 0xaf, + 0x55, 0xed, 0xff, 0x0d, 0x59, 0x71, 0x1f, 0x11, 0x71, 0x41, 0x27, 0x04, 0x3d, 0x84, 0x4d, 0xf3, + 0x30, 0x3e, 0x23, 0x12, 0xdd, 0xe8, 0x99, 0xbf, 0x7f, 0xbd, 0xe4, 0xef, 0x5f, 0x6f, 0xa0, 0xfe, + 0xfe, 0xb5, 0xb7, 0xf3, 0x82, 0x87, 0x1e, 0x41, 0x33, 0x23, 0xdb, 0xa8, 0x5d, 0xd0, 0xc3, 0x8c, + 0x3c, 0x2c, 0xb9, 0xee, 0xc3, 0xb6, 0x65, 0x9d, 0xc7, 0xd2, 0xe7, 0xef, 0xd9, 0x47, 0x27, 0x3d, + 0x4e, 0x3d, 0xed, 0xfb, 0x86, 0xee, 0x5c, 0xaa, 0xc3, 0xed, 0xdb, 0x65, 0x66, 0xd5, 0xe0, 0x6f, + 0x61, 0x2b, 0x2b, 0x95, 0xa8, 0x40, 0xce, 0x09, 0xe8, 0x52, 0x29, 0xa9, 0xb3, 0x11, 0xcf, 0xa2, + 0x73, 0x4e, 0x52, 0x97, 0x9c, 0x87, 0x89, 0xf2, 0xe6, 0xe4, 0x14, 0xb9, 0x79, 0xda, 0x2a, 0xad, + 0x5d, 0x0a, 0xf5, 0x04, 0x6e, 0x14, 0xd8, 0xff, 0xb5, 0xa9, 0x67, 0xe0, 0x7e, 0x58, 0xa1, 0xd1, + 0x97, 0x79, 0xaf, 0x8f, 0x50, 0xf3, 0xa5, 0x44, 0x8f, 0xd3, 0x29, 0x55, 0x2f, 0x78, 0x69, 0x7d, + 0x4e, 0x41, 0x9c, 0x16, 0x2a, 0xfb, 0x18, 0xc0, 0x62, 0x66, 0x52, 0x57, 0xfe, 0x05, 0x6d, 0x97, + 0x2b, 0x12, 0xfa, 0x19, 0x6e, 0x96, 0xc8, 0x2d, 0xba, 0x5b, 0xea, 0x95, 0xd3, 0xe3, 0xcb, 0xa2, + 0x3f, 0x86, 0x2b, 0xf6, 0xf3, 0x29, 0x09, 0x88, 0x24, 0xa5, 0x15, 0x96, 0xec, 0x1c, 0x0d, 0xd2, + 0x00, 0xaf, 0x42, 0x5f, 0x15, 0x55, 0x9e, 0xec, 0xb2, 0x3a, 0x46, 0xb0, 0xbb, 0x52, 0xc1, 0x4b, + 0xeb, 0x71, 0x0b, 0xf8, 0x2a, 0xe1, 0x1f, 0xc2, 0x8e, 0xb5, 0xbe, 0x26, 0x82, 0x4e, 0xe7, 0x1f, + 0x8a, 0x79, 0x49, 0x7d, 0x07, 0xd0, 0xcc, 0x28, 0xf9, 0xe2, 0xe9, 0x58, 0x96, 0xf7, 0xd2, 0x4e, + 0x0d, 0xa1, 0x55, 0x94, 0x95, 0xd2, 0x79, 0xba, 0x53, 0x10, 0x96, 0x82, 0x10, 0x7d, 0x0f, 0xb0, + 0x78, 0x79, 0x4b, 0x83, 0xdc, 0x2c, 0xbc, 0xbd, 0x89, 0xfb, 0x69, 0x5d, 0x13, 0x1f, 0xfe, 0x1b, + 0x00, 0x00, 0xff, 0xff, 0x85, 0x2c, 0x1e, 0x8b, 0x50, 0x0f, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/longhorn/longhorn-engine/proto/ptypes/controller.proto b/vendor/github.com/longhorn/longhorn-engine/proto/ptypes/controller.proto index 5f529bec7b..e1d5226e5c 100644 --- a/vendor/github.com/longhorn/longhorn-engine/proto/ptypes/controller.proto +++ b/vendor/github.com/longhorn/longhorn-engine/proto/ptypes/controller.proto @@ -48,6 +48,7 @@ message Volume { message ReplicaAddress { string address = 1; + string instanceName = 2; } enum ReplicaMode { diff --git a/vendor/github.com/longhorn/longhorn-engine/proto/ptypes/interceptor.go b/vendor/github.com/longhorn/longhorn-engine/proto/ptypes/interceptor.go new file mode 100644 index 0000000000..18e7292290 --- /dev/null +++ b/vendor/github.com/longhorn/longhorn-engine/proto/ptypes/interceptor.go @@ -0,0 +1,84 @@ +package ptypes + +import ( + context "context" + + "github.com/sirupsen/logrus" + "google.golang.org/grpc" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/metadata" + "google.golang.org/grpc/status" +) + +func WithIdentityValidationControllerServerInterceptor(volumeName, instanceName string) grpc.ServerOption { + return grpc.UnaryInterceptor(identityValidationServerInterceptor(volumeName, instanceName, "controller")) +} + +func WithIdentityValidationReplicaServerInterceptor(volumeName, instanceName string) grpc.ServerOption { + return grpc.UnaryInterceptor(identityValidationServerInterceptor(volumeName, instanceName, "replica")) +} + +func identityValidationServerInterceptor(volumeName, instanceName, serverType string) grpc.UnaryServerInterceptor { + // Use a closure to remember the correct volumeName and/or instanceName. + return func(ctx context.Context, req any, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (any, error) { + md, ok := metadata.FromIncomingContext(ctx) + if ok { + var incomingVolumeName string + incomingVolumeNames := md.Get("volume-name") + if len(incomingVolumeNames) == 1 { + // If len > 1, why? There is no legitimate reason, so do not validate. + incomingVolumeName = incomingVolumeNames[0] + } + // Only refuse to serve if both client and server provide validation information. + if incomingVolumeName != "" && volumeName != "" { + log := logrus.WithFields(logrus.Fields{"method": info.FullMethod, + "clientVolumeName": incomingVolumeName, "serverVolumeName": volumeName}) + if incomingVolumeName != volumeName { + log.Error("Invalid gRPC metadata") + return nil, status.Errorf(codes.FailedPrecondition, "incorrect volume name %s; check %s address", + incomingVolumeName, serverType) + } + log.Trace("Valid gRPC metadata") + } + + var incomingInstanceName string + incomingInstanceNames := md.Get("instance-name") + if len(incomingInstanceNames) == 1 { + // If len > 1, why? There is no legitimate reason, so do not validate. + incomingInstanceName = incomingInstanceNames[0] + } + // Only refuse to serve if both client and server provide validation information. + if incomingInstanceName != "" && instanceName != "" { + log := logrus.WithFields(logrus.Fields{"method": info.FullMethod, + "clientInstanceName": incomingInstanceName, "serverInstanceName": instanceName}) + if incomingInstanceName != instanceName { + log.Error("Invalid gRPC metadata") + return nil, status.Errorf(codes.FailedPrecondition, "incorrect instance name %s; check %s address", + incomingInstanceName, serverType) + } + log.Trace("Valid gRPC metadata") + } + } + + // Call the RPC's actual handler. + return handler(ctx, req) + } +} + +func WithIdentityValidationClientInterceptor(volumeName, instanceName string) grpc.DialOption { + return grpc.WithUnaryInterceptor(identityValidationClientInterceptor(volumeName, instanceName)) +} + +func identityValidationClientInterceptor(volumeName, instanceName string) grpc.UnaryClientInterceptor { + // Use a closure to remember the correct volumeName and/or instanceName. + return func(ctx context.Context, method string, req any, reply any, cc *grpc.ClientConn, + invoker grpc.UnaryInvoker, opts ...grpc.CallOption) error { + if volumeName != "" { + ctx = metadata.AppendToOutgoingContext(ctx, "volume-name", volumeName) + } + if instanceName != "" { + ctx = metadata.AppendToOutgoingContext(ctx, "instance-name", instanceName) + } + return invoker(ctx, method, req, reply, cc, opts...) + } +} diff --git a/vendor/github.com/longhorn/longhorn-instance-manager/pkg/client/proxy_backup.go b/vendor/github.com/longhorn/longhorn-instance-manager/pkg/client/proxy_backup.go index 6aaec276d4..d881cff55c 100644 --- a/vendor/github.com/longhorn/longhorn-instance-manager/pkg/client/proxy_backup.go +++ b/vendor/github.com/longhorn/longhorn-instance-manager/pkg/client/proxy_backup.go @@ -9,11 +9,12 @@ import ( rpc "github.com/longhorn/longhorn-instance-manager/pkg/imrpc" ) -func (c *ProxyClient) SnapshotBackup(backendStoreDriver, engineName, serviceAddress, backupName, snapshotName, backupTarget, - backingImageName, backingImageChecksum, compressionMethod string, concurrentLimit int, storageClassName string, - labels map[string]string, envs []string) (backupID, replicaAddress string, err error) { +func (c *ProxyClient) SnapshotBackup(backendStoreDriver, engineName, volumeName, serviceAddress, backupName, + snapshotName, backupTarget, backingImageName, backingImageChecksum, compressionMethod string, concurrentLimit int, + storageClassName string, labels map[string]string, envs []string) (backupID, replicaAddress string, err error) { input := map[string]string{ "engineName": engineName, + "volumeName": volumeName, "serviceAddress": serviceAddress, } if err := validateProxyMethodParameters(input); err != nil { @@ -34,6 +35,7 @@ func (c *ProxyClient) SnapshotBackup(backendStoreDriver, engineName, serviceAddr Address: serviceAddress, EngineName: engineName, BackendStoreDriver: rpc.BackendStoreDriver(driver), + VolumeName: volumeName, }, Envs: envs, BackupName: backupName, @@ -54,9 +56,11 @@ func (c *ProxyClient) SnapshotBackup(backendStoreDriver, engineName, serviceAddr return recv.BackupId, recv.Replica, nil } -func (c *ProxyClient) SnapshotBackupStatus(backendStoreDriver, engineName, serviceAddress, backupName, replicaAddress string) (status *SnapshotBackupStatus, err error) { +func (c *ProxyClient) SnapshotBackupStatus(backendStoreDriver, engineName, volumeName, serviceAddress, backupName, + replicaAddress, replicaName string) (status *SnapshotBackupStatus, err error) { input := map[string]string{ "engineName": engineName, + "volumeName": volumeName, "serviceAddress": serviceAddress, "backupName": backupName, } @@ -78,9 +82,13 @@ func (c *ProxyClient) SnapshotBackupStatus(backendStoreDriver, engineName, servi Address: serviceAddress, EngineName: engineName, BackendStoreDriver: rpc.BackendStoreDriver(driver), + VolumeName: volumeName, }, BackupName: backupName, ReplicaAddress: replicaAddress, + // For now, it is unlikely we actually know replicaName. Pass it anyway, as an empty string will not cause a + // validation failure and this may change in the future. + ReplicaName: replicaName, } recv, err := c.service.SnapshotBackupStatus(getContextWithGRPCTimeout(c.ctx), req) if err != nil { @@ -98,13 +106,15 @@ func (c *ProxyClient) SnapshotBackupStatus(backendStoreDriver, engineName, servi return status, nil } -func (c *ProxyClient) BackupRestore(backendStoreDriver, engineName, serviceAddress, url, target, volumeName string, envs []string, concurrentLimit int) (err error) { +func (c *ProxyClient) BackupRestore(backendStoreDriver, engineName, volumeName, serviceAddress, url, target, + backupVolumeName string, envs []string, concurrentLimit int) (err error) { input := map[string]string{ - "engineName": engineName, - "serviceAddress": serviceAddress, - "url": url, - "target": target, - "volumeName": volumeName, + "engineName": engineName, + "volumeName": volumeName, + "serviceAddress": serviceAddress, + "url": url, + "target": target, + "backupVolumeName": backupVolumeName, } if err := validateProxyMethodParameters(input); err != nil { return errors.Wrap(err, "failed to restore backup to volume") @@ -128,11 +138,14 @@ func (c *ProxyClient) BackupRestore(backendStoreDriver, engineName, serviceAddre Address: serviceAddress, EngineName: engineName, BackendStoreDriver: rpc.BackendStoreDriver(driver), + // This is the name we will use for validation when communicating with the restoring engine. + VolumeName: volumeName, }, - Envs: envs, - Url: url, - Target: target, - VolumeName: volumeName, + Envs: envs, + Url: url, + Target: target, + // Historically, we have passed backupVolumeName as VolumeName here. + VolumeName: backupVolumeName, ConcurrentLimit: int32(concurrentLimit), } recv, err := c.service.BackupRestore(getContextWithGRPCTimeout(c.ctx), req) @@ -154,9 +167,11 @@ func (c *ProxyClient) BackupRestore(backendStoreDriver, engineName, serviceAddre return nil } -func (c *ProxyClient) BackupRestoreStatus(backendStoreDriver, engineName, serviceAddress string) (status map[string]*BackupRestoreStatus, err error) { +func (c *ProxyClient) BackupRestoreStatus(backendStoreDriver, engineName, volumeName, + serviceAddress string) (status map[string]*BackupRestoreStatus, err error) { input := map[string]string{ "engineName": engineName, + "volumeName": volumeName, "serviceAddress": serviceAddress, } if err := validateProxyMethodParameters(input); err != nil { @@ -174,8 +189,9 @@ func (c *ProxyClient) BackupRestoreStatus(backendStoreDriver, engineName, servic req := &rpc.ProxyEngineRequest{ Address: serviceAddress, - EngineName: engineName, BackendStoreDriver: rpc.BackendStoreDriver(driver), + EngineName: engineName, + VolumeName: volumeName, } recv, err := c.service.BackupRestoreStatus(getContextWithGRPCTimeout(c.ctx), req) if err != nil { diff --git a/vendor/github.com/longhorn/longhorn-instance-manager/pkg/client/proxy_metrics.go b/vendor/github.com/longhorn/longhorn-instance-manager/pkg/client/proxy_metrics.go index d54fa41f00..d4ed0a4c3d 100644 --- a/vendor/github.com/longhorn/longhorn-instance-manager/pkg/client/proxy_metrics.go +++ b/vendor/github.com/longhorn/longhorn-instance-manager/pkg/client/proxy_metrics.go @@ -6,8 +6,10 @@ import ( rpc "github.com/longhorn/longhorn-instance-manager/pkg/imrpc" ) -func (c *ProxyClient) MetricsGet(serviceAddress string) (metrics *Metrics, err error) { +func (c *ProxyClient) MetricsGet(engineName, volumeName, serviceAddress string) (metrics *Metrics, err error) { input := map[string]string{ + "engineName": engineName, + "volumeName": volumeName, "serviceAddress": serviceAddress, } if err := validateProxyMethodParameters(input); err != nil { @@ -19,7 +21,9 @@ func (c *ProxyClient) MetricsGet(serviceAddress string) (metrics *Metrics, err e }() req := &rpc.ProxyEngineRequest{ - Address: serviceAddress, + Address: serviceAddress, + EngineName: engineName, + VolumeName: volumeName, } resp, err := c.service.MetricsGet(getContextWithGRPCTimeout(c.ctx), req) if err != nil { diff --git a/vendor/github.com/longhorn/longhorn-instance-manager/pkg/client/proxy_replica.go b/vendor/github.com/longhorn/longhorn-instance-manager/pkg/client/proxy_replica.go index a979054bfb..1a8a61c56c 100644 --- a/vendor/github.com/longhorn/longhorn-instance-manager/pkg/client/proxy_replica.go +++ b/vendor/github.com/longhorn/longhorn-instance-manager/pkg/client/proxy_replica.go @@ -11,10 +11,13 @@ import ( rpc "github.com/longhorn/longhorn-instance-manager/pkg/imrpc" ) -func (c *ProxyClient) ReplicaAdd(backendStoreDriver, engineName, serviceAddress, replicaName, replicaAddress string, restore bool, size, currentSize int64, fileSyncHTTPClientTimeout int, fastSync bool) (err error) { +func (c *ProxyClient) ReplicaAdd(backendStoreDriver, engineName, volumeName, serviceAddress, replicaName, + replicaAddress string, restore bool, size, currentSize int64, fileSyncHTTPClientTimeout int, + fastSync bool) (err error) { input := map[string]string{ - "serviceAddress": serviceAddress, "engineName": engineName, + "volumeName": volumeName, + "serviceAddress": serviceAddress, "replicaName": replicaName, "replicaAddress": replicaAddress, } @@ -40,6 +43,7 @@ func (c *ProxyClient) ReplicaAdd(backendStoreDriver, engineName, serviceAddress, Address: serviceAddress, EngineName: engineName, BackendStoreDriver: rpc.BackendStoreDriver(driver), + VolumeName: volumeName, }, ReplicaName: replicaName, ReplicaAddress: replicaAddress, @@ -57,9 +61,11 @@ func (c *ProxyClient) ReplicaAdd(backendStoreDriver, engineName, serviceAddress, return nil } -func (c *ProxyClient) ReplicaList(backendStoreDriver, engineName, serviceAddress string) (rInfoList []*etypes.ControllerReplicaInfo, err error) { +func (c *ProxyClient) ReplicaList(backendStoreDriver, engineName, volumeName, + serviceAddress string) (rInfoList []*etypes.ControllerReplicaInfo, err error) { input := map[string]string{ "engineName": engineName, + "volumeName": volumeName, "serviceAddress": serviceAddress, } if err := validateProxyMethodParameters(input); err != nil { @@ -79,6 +85,7 @@ func (c *ProxyClient) ReplicaList(backendStoreDriver, engineName, serviceAddress Address: serviceAddress, EngineName: engineName, BackendStoreDriver: rpc.BackendStoreDriver(driver), + VolumeName: volumeName, } resp, err := c.service.ReplicaList(getContextWithGRPCTimeout(c.ctx), req) if err != nil { @@ -95,9 +102,11 @@ func (c *ProxyClient) ReplicaList(backendStoreDriver, engineName, serviceAddress return rInfoList, nil } -func (c *ProxyClient) ReplicaRebuildingStatus(backendStoreDriver, engineName, serviceAddress string) (status map[string]*ReplicaRebuildStatus, err error) { +func (c *ProxyClient) ReplicaRebuildingStatus(backendStoreDriver, engineName, volumeName, + serviceAddress string) (status map[string]*ReplicaRebuildStatus, err error) { input := map[string]string{ "engineName": engineName, + "volumeName": volumeName, "serviceAddress": serviceAddress, } if err := validateProxyMethodParameters(input); err != nil { @@ -117,6 +126,7 @@ func (c *ProxyClient) ReplicaRebuildingStatus(backendStoreDriver, engineName, se Address: serviceAddress, EngineName: engineName, BackendStoreDriver: rpc.BackendStoreDriver(driver), + VolumeName: volumeName, } recv, err := c.service.ReplicaRebuildingStatus(getContextWithGRPCTimeout(c.ctx), req) if err != nil { @@ -136,10 +146,14 @@ func (c *ProxyClient) ReplicaRebuildingStatus(backendStoreDriver, engineName, se return status, nil } -func (c *ProxyClient) ReplicaVerifyRebuild(backendStoreDriver, serviceAddress, replicaAddress string) (err error) { +func (c *ProxyClient) ReplicaVerifyRebuild(backendStoreDriver, engineName, volumeName, serviceAddress, + replicaAddress, replicaName string) (err error) { input := map[string]string{ + "engineName": engineName, + "volumeName": volumeName, "serviceAddress": serviceAddress, "replicaAddress": replicaAddress, + "replicaName": replicaName, } if err := validateProxyMethodParameters(input); err != nil { return errors.Wrap(err, "failed to verify replica rebuild") @@ -157,9 +171,12 @@ func (c *ProxyClient) ReplicaVerifyRebuild(backendStoreDriver, serviceAddress, r req := &rpc.EngineReplicaVerifyRebuildRequest{ ProxyEngineRequest: &rpc.ProxyEngineRequest{ Address: serviceAddress, + EngineName: engineName, BackendStoreDriver: rpc.BackendStoreDriver(driver), + VolumeName: volumeName, }, ReplicaAddress: replicaAddress, + ReplicaName: replicaName, } _, err = c.service.ReplicaVerifyRebuild(getContextWithGRPCTimeout(c.ctx), req) if err != nil { diff --git a/vendor/github.com/longhorn/longhorn-instance-manager/pkg/client/proxy_snapshot.go b/vendor/github.com/longhorn/longhorn-instance-manager/pkg/client/proxy_snapshot.go index 822da3698c..f2a291e038 100644 --- a/vendor/github.com/longhorn/longhorn-instance-manager/pkg/client/proxy_snapshot.go +++ b/vendor/github.com/longhorn/longhorn-instance-manager/pkg/client/proxy_snapshot.go @@ -12,9 +12,11 @@ import ( rpc "github.com/longhorn/longhorn-instance-manager/pkg/imrpc" ) -func (c *ProxyClient) VolumeSnapshot(backendStoreDriver, engineName, serviceAddress, volumeSnapshotName string, labels map[string]string) (snapshotName string, err error) { +func (c *ProxyClient) VolumeSnapshot(backendStoreDriver, engineName, volumeName, serviceAddress, + volumeSnapshotName string, labels map[string]string) (snapshotName string, err error) { input := map[string]string{ "engineName": engineName, + "volumeName": volumeName, "serviceAddress": serviceAddress, } if err := validateProxyMethodParameters(input); err != nil { @@ -49,6 +51,7 @@ func (c *ProxyClient) VolumeSnapshot(backendStoreDriver, engineName, serviceAddr Address: serviceAddress, EngineName: engineName, BackendStoreDriver: rpc.BackendStoreDriver(driver), + VolumeName: volumeName, }, SnapshotVolume: &eptypes.VolumeSnapshotRequest{ Name: volumeSnapshotName, @@ -63,9 +66,11 @@ func (c *ProxyClient) VolumeSnapshot(backendStoreDriver, engineName, serviceAddr return recv.Snapshot.Name, nil } -func (c *ProxyClient) SnapshotList(backendStoreDriver, engineName, serviceAddress string) (snapshotDiskInfo map[string]*etypes.DiskInfo, err error) { +func (c *ProxyClient) SnapshotList(backendStoreDriver, engineName, volumeName, + serviceAddress string) (snapshotDiskInfo map[string]*etypes.DiskInfo, err error) { input := map[string]string{ "engineName": engineName, + "volumeName": volumeName, "serviceAddress": serviceAddress, } if err := validateProxyMethodParameters(input); err != nil { @@ -85,6 +90,7 @@ func (c *ProxyClient) SnapshotList(backendStoreDriver, engineName, serviceAddres Address: serviceAddress, EngineName: engineName, BackendStoreDriver: rpc.BackendStoreDriver(driver), + VolumeName: volumeName, } resp, err := c.service.SnapshotList(getContextWithGRPCTimeout(c.ctx), req) if err != nil { @@ -113,12 +119,15 @@ func (c *ProxyClient) SnapshotList(backendStoreDriver, engineName, serviceAddres return snapshotDiskInfo, nil } -func (c *ProxyClient) SnapshotClone(backendStoreDriver, engineName, serviceAddress, snapshotName, fromController string, fileSyncHTTPClientTimeout int) (err error) { +func (c *ProxyClient) SnapshotClone(backendStoreDriver, engineName, volumeName, serviceAddress, snapshotName, + fromEngineAddress, fromEngineName string, fileSyncHTTPClientTimeout int) (err error) { input := map[string]string{ - "engineName": engineName, - "serviceAddress": serviceAddress, - "snapshotName": snapshotName, - "fromController": fromController, + "engineName": engineName, + "volumeName": volumeName, + "serviceAddress": serviceAddress, + "snapshotName": snapshotName, + "fromEngineAddress": fromEngineAddress, + "fromEngineName": fromEngineName, } if err := validateProxyMethodParameters(input); err != nil { return errors.Wrap(err, "failed to clone snapshot") @@ -130,7 +139,8 @@ func (c *ProxyClient) SnapshotClone(backendStoreDriver, engineName, serviceAddre } defer func() { - err = errors.Wrapf(err, "%v failed to clone snapshot %v from %v", c.getProxyErrorPrefix(serviceAddress), snapshotName, fromController) + err = errors.Wrapf(err, "%v failed to clone snapshot %v from %v", c.getProxyErrorPrefix(serviceAddress), + snapshotName, fromEngineAddress) }() req := &rpc.EngineSnapshotCloneRequest{ @@ -138,11 +148,13 @@ func (c *ProxyClient) SnapshotClone(backendStoreDriver, engineName, serviceAddre Address: serviceAddress, EngineName: engineName, BackendStoreDriver: rpc.BackendStoreDriver(driver), + VolumeName: volumeName, }, - FromController: fromController, + FromEngineAddress: fromEngineAddress, SnapshotName: snapshotName, ExportBackingImageIfExist: false, FileSyncHttpClientTimeout: int32(fileSyncHTTPClientTimeout), + FromEngineName: fromEngineName, } _, err = c.service.SnapshotClone(getContextWithGRPCLongTimeout(c.ctx), req) if err != nil { @@ -152,9 +164,10 @@ func (c *ProxyClient) SnapshotClone(backendStoreDriver, engineName, serviceAddre return nil } -func (c *ProxyClient) SnapshotCloneStatus(backendStoreDriver, engineName, serviceAddress string) (status map[string]*SnapshotCloneStatus, err error) { +func (c *ProxyClient) SnapshotCloneStatus(backendStoreDriver, engineName, volumeName, serviceAddress string) (status map[string]*SnapshotCloneStatus, err error) { input := map[string]string{ "engineName": engineName, + "volumeName": volumeName, "serviceAddress": serviceAddress, } if err := validateProxyMethodParameters(input); err != nil { @@ -174,6 +187,7 @@ func (c *ProxyClient) SnapshotCloneStatus(backendStoreDriver, engineName, servic Address: serviceAddress, EngineName: engineName, BackendStoreDriver: rpc.BackendStoreDriver(driver), + VolumeName: volumeName, } recv, err := c.service.SnapshotCloneStatus(getContextWithGRPCTimeout(c.ctx), req) if err != nil { @@ -194,9 +208,11 @@ func (c *ProxyClient) SnapshotCloneStatus(backendStoreDriver, engineName, servic return status, nil } -func (c *ProxyClient) SnapshotRevert(backendStoreDriver, engineName, serviceAddress string, name string) (err error) { +func (c *ProxyClient) SnapshotRevert(backendStoreDriver, engineName, volumeName, serviceAddress string, + name string) (err error) { input := map[string]string{ "engineName": engineName, + "volumeName": volumeName, "serviceAddress": serviceAddress, "name": name, } @@ -223,6 +239,7 @@ func (c *ProxyClient) SnapshotRevert(backendStoreDriver, engineName, serviceAddr Address: serviceAddress, EngineName: engineName, BackendStoreDriver: rpc.BackendStoreDriver(driver), + VolumeName: volumeName, }, Name: name, } @@ -234,9 +251,11 @@ func (c *ProxyClient) SnapshotRevert(backendStoreDriver, engineName, serviceAddr return nil } -func (c *ProxyClient) SnapshotPurge(backendStoreDriver, engineName, serviceAddress string, skipIfInProgress bool) (err error) { +func (c *ProxyClient) SnapshotPurge(backendStoreDriver, engineName, volumeName, serviceAddress string, + skipIfInProgress bool) (err error) { input := map[string]string{ "engineName": engineName, + "volumeName": volumeName, "serviceAddress": serviceAddress, } if err := validateProxyMethodParameters(input); err != nil { @@ -257,6 +276,7 @@ func (c *ProxyClient) SnapshotPurge(backendStoreDriver, engineName, serviceAddre Address: serviceAddress, EngineName: engineName, BackendStoreDriver: rpc.BackendStoreDriver(driver), + VolumeName: volumeName, }, SkipIfInProgress: skipIfInProgress, } @@ -268,9 +288,10 @@ func (c *ProxyClient) SnapshotPurge(backendStoreDriver, engineName, serviceAddre return nil } -func (c *ProxyClient) SnapshotPurgeStatus(backendStoreDriver, engineName, serviceAddress string) (status map[string]*SnapshotPurgeStatus, err error) { +func (c *ProxyClient) SnapshotPurgeStatus(backendStoreDriver, engineName, volumeName, serviceAddress string) (status map[string]*SnapshotPurgeStatus, err error) { input := map[string]string{ "engineName": engineName, + "volumeName": volumeName, "serviceAddress": serviceAddress, } if err := validateProxyMethodParameters(input); err != nil { @@ -290,6 +311,7 @@ func (c *ProxyClient) SnapshotPurgeStatus(backendStoreDriver, engineName, servic Address: serviceAddress, EngineName: engineName, BackendStoreDriver: rpc.BackendStoreDriver(driver), + VolumeName: volumeName, } recv, err := c.service.SnapshotPurgeStatus(getContextWithGRPCTimeout(c.ctx), req) @@ -309,9 +331,11 @@ func (c *ProxyClient) SnapshotPurgeStatus(backendStoreDriver, engineName, servic return status, nil } -func (c *ProxyClient) SnapshotRemove(backendStoreDriver, engineName, serviceAddress string, names []string) (err error) { +func (c *ProxyClient) SnapshotRemove(backendStoreDriver, engineName, volumeName, serviceAddress string, + names []string) (err error) { input := map[string]string{ "engineName": engineName, + "volumeName": volumeName, "serviceAddress": serviceAddress, } if err := validateProxyMethodParameters(input); err != nil { @@ -332,6 +356,7 @@ func (c *ProxyClient) SnapshotRemove(backendStoreDriver, engineName, serviceAddr Address: serviceAddress, EngineName: engineName, BackendStoreDriver: rpc.BackendStoreDriver(driver), + VolumeName: volumeName, }, Names: names, } @@ -343,9 +368,11 @@ func (c *ProxyClient) SnapshotRemove(backendStoreDriver, engineName, serviceAddr return nil } -func (c *ProxyClient) SnapshotHash(backendStoreDriver, engineName, serviceAddress string, snapshotName string, rehash bool) (err error) { +func (c *ProxyClient) SnapshotHash(backendStoreDriver, engineName, volumeName, serviceAddress string, + snapshotName string, rehash bool) (err error) { input := map[string]string{ "engineName": engineName, + "volumeName": volumeName, "serviceAddress": serviceAddress, } if err := validateProxyMethodParameters(input); err != nil { @@ -366,6 +393,7 @@ func (c *ProxyClient) SnapshotHash(backendStoreDriver, engineName, serviceAddres Address: serviceAddress, EngineName: engineName, BackendStoreDriver: rpc.BackendStoreDriver(driver), + VolumeName: volumeName, }, SnapshotName: snapshotName, Rehash: rehash, @@ -378,9 +406,11 @@ func (c *ProxyClient) SnapshotHash(backendStoreDriver, engineName, serviceAddres return nil } -func (c *ProxyClient) SnapshotHashStatus(backendStoreDriver, engineName, serviceAddress, snapshotName string) (status map[string]*SnapshotHashStatus, err error) { +func (c *ProxyClient) SnapshotHashStatus(backendStoreDriver, engineName, volumeName, serviceAddress, + snapshotName string) (status map[string]*SnapshotHashStatus, err error) { input := map[string]string{ "engineName": engineName, + "volumeName": volumeName, "serviceAddress": serviceAddress, } if err := validateProxyMethodParameters(input); err != nil { @@ -401,6 +431,7 @@ func (c *ProxyClient) SnapshotHashStatus(backendStoreDriver, engineName, service Address: serviceAddress, EngineName: engineName, BackendStoreDriver: rpc.BackendStoreDriver(driver), + VolumeName: volumeName, }, SnapshotName: snapshotName, } diff --git a/vendor/github.com/longhorn/longhorn-instance-manager/pkg/client/proxy_volume.go b/vendor/github.com/longhorn/longhorn-instance-manager/pkg/client/proxy_volume.go index 590789c601..17454024b5 100644 --- a/vendor/github.com/longhorn/longhorn-instance-manager/pkg/client/proxy_volume.go +++ b/vendor/github.com/longhorn/longhorn-instance-manager/pkg/client/proxy_volume.go @@ -12,9 +12,10 @@ import ( rpc "github.com/longhorn/longhorn-instance-manager/pkg/imrpc" ) -func (c *ProxyClient) VolumeGet(backendStoreDriver, engineName, serviceAddress string) (info *etypes.VolumeInfo, err error) { +func (c *ProxyClient) VolumeGet(backendStoreDriver, engineName, volumeName, serviceAddress string) (info *etypes.VolumeInfo, err error) { input := map[string]string{ "engineName": engineName, + "volumeName": volumeName, "serviceAddress": serviceAddress, } if err := validateProxyMethodParameters(input); err != nil { @@ -34,6 +35,7 @@ func (c *ProxyClient) VolumeGet(backendStoreDriver, engineName, serviceAddress s Address: serviceAddress, EngineName: engineName, BackendStoreDriver: rpc.BackendStoreDriver(driver), + VolumeName: volumeName, } resp, err := c.service.VolumeGet(getContextWithGRPCTimeout(c.ctx), req) if err != nil { @@ -55,9 +57,11 @@ func (c *ProxyClient) VolumeGet(backendStoreDriver, engineName, serviceAddress s return info, nil } -func (c *ProxyClient) VolumeExpand(backendStoreDriver, engineName, serviceAddress string, size int64) (err error) { +func (c *ProxyClient) VolumeExpand(backendStoreDriver, engineName, volumeName, serviceAddress string, + size int64) (err error) { input := map[string]string{ "engineName": engineName, + "volumeName": volumeName, "serviceAddress": serviceAddress, } if err := validateProxyMethodParameters(input); err != nil { @@ -78,6 +82,7 @@ func (c *ProxyClient) VolumeExpand(backendStoreDriver, engineName, serviceAddres Address: serviceAddress, EngineName: engineName, BackendStoreDriver: rpc.BackendStoreDriver(driver), + VolumeName: volumeName, }, Expand: &eptypes.VolumeExpandRequest{ Size: size, @@ -91,10 +96,11 @@ func (c *ProxyClient) VolumeExpand(backendStoreDriver, engineName, serviceAddres return nil } -func (c *ProxyClient) VolumeFrontendStart(backendStoreDriver, engineName, serviceAddress, frontendName string) (err error) { +func (c *ProxyClient) VolumeFrontendStart(backendStoreDriver, engineName, volumeName, serviceAddress, frontendName string) (err error) { input := map[string]string{ - "serviceAddress": serviceAddress, "engineName": engineName, + "volumeName": volumeName, + "serviceAddress": serviceAddress, "frontendName": frontendName, } if err := validateProxyMethodParameters(input); err != nil { @@ -115,6 +121,7 @@ func (c *ProxyClient) VolumeFrontendStart(backendStoreDriver, engineName, servic Address: serviceAddress, EngineName: engineName, BackendStoreDriver: rpc.BackendStoreDriver(driver), + VolumeName: volumeName, }, FrontendStart: &eptypes.VolumeFrontendStartRequest{ Frontend: frontendName, @@ -128,9 +135,11 @@ func (c *ProxyClient) VolumeFrontendStart(backendStoreDriver, engineName, servic return nil } -func (c *ProxyClient) VolumeFrontendShutdown(backendStoreDriver, engineName, serviceAddress string) (err error) { +func (c *ProxyClient) VolumeFrontendShutdown(backendStoreDriver, engineName, volumeName, + serviceAddress string) (err error) { input := map[string]string{ "engineName": engineName, + "volumeName": volumeName, "serviceAddress": serviceAddress, } if err := validateProxyMethodParameters(input); err != nil { @@ -150,6 +159,7 @@ func (c *ProxyClient) VolumeFrontendShutdown(backendStoreDriver, engineName, ser Address: serviceAddress, EngineName: engineName, BackendStoreDriver: rpc.BackendStoreDriver(driver), + VolumeName: volumeName, } _, err = c.service.VolumeFrontendShutdown(getContextWithGRPCTimeout(c.ctx), req) if err != nil { @@ -159,9 +169,11 @@ func (c *ProxyClient) VolumeFrontendShutdown(backendStoreDriver, engineName, ser return nil } -func (c *ProxyClient) VolumeUnmapMarkSnapChainRemovedSet(backendStoreDriver, engineName, serviceAddress string, enabled bool) (err error) { +func (c *ProxyClient) VolumeUnmapMarkSnapChainRemovedSet(backendStoreDriver, engineName, volumeName, + serviceAddress string, enabled bool) (err error) { input := map[string]string{ "engineName": engineName, + "volumeName": volumeName, "serviceAddress": serviceAddress, "enabled": strconv.FormatBool(enabled), } @@ -183,6 +195,7 @@ func (c *ProxyClient) VolumeUnmapMarkSnapChainRemovedSet(backendStoreDriver, eng Address: serviceAddress, EngineName: engineName, BackendStoreDriver: rpc.BackendStoreDriver(driver), + VolumeName: volumeName, }, UnmapMarkSnap: &eptypes.VolumeUnmapMarkSnapChainRemovedSetRequest{Enabled: enabled}, } diff --git a/vendor/github.com/longhorn/longhorn-instance-manager/pkg/imrpc/proxy.pb.go b/vendor/github.com/longhorn/longhorn-instance-manager/pkg/imrpc/proxy.pb.go index 255985b9c3..ce7c835414 100644 --- a/vendor/github.com/longhorn/longhorn-instance-manager/pkg/imrpc/proxy.pb.go +++ b/vendor/github.com/longhorn/longhorn-instance-manager/pkg/imrpc/proxy.pb.go @@ -30,6 +30,7 @@ type ProxyEngineRequest struct { Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` BackendStoreDriver BackendStoreDriver `protobuf:"varint,2,opt,name=backend_store_driver,json=backendStoreDriver,proto3,enum=imrpc.BackendStoreDriver" json:"backend_store_driver,omitempty"` EngineName string `protobuf:"bytes,3,opt,name=engine_name,json=engineName,proto3" json:"engine_name,omitempty"` + VolumeName string `protobuf:"bytes,4,opt,name=volume_name,json=volumeName,proto3" json:"volume_name,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -81,6 +82,13 @@ func (m *ProxyEngineRequest) GetEngineName() string { return "" } +func (m *ProxyEngineRequest) GetVolumeName() string { + if m != nil { + return m.VolumeName + } + return "" +} + type EngineVersionProxyResponse struct { Version *ptypes.VersionOutput `protobuf:"bytes,1,opt,name=version,proto3" json:"version,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -661,10 +669,11 @@ func (m *EngineSnapshotPurgeStatusProxyResponse) GetStatus() map[string]*ptypes. type EngineSnapshotCloneRequest struct { ProxyEngineRequest *ProxyEngineRequest `protobuf:"bytes,1,opt,name=proxy_engine_request,json=proxyEngineRequest,proto3" json:"proxy_engine_request,omitempty"` - FromController string `protobuf:"bytes,2,opt,name=from_controller,json=fromController,proto3" json:"from_controller,omitempty"` + FromEngineAddress string `protobuf:"bytes,2,opt,name=from_engine_address,json=fromEngineAddress,proto3" json:"from_engine_address,omitempty"` SnapshotName string `protobuf:"bytes,3,opt,name=snapshot_name,json=snapshotName,proto3" json:"snapshot_name,omitempty"` ExportBackingImageIfExist bool `protobuf:"varint,4,opt,name=export_backing_image_if_exist,json=exportBackingImageIfExist,proto3" json:"export_backing_image_if_exist,omitempty"` FileSyncHttpClientTimeout int32 `protobuf:"varint,5,opt,name=file_sync_http_client_timeout,json=fileSyncHttpClientTimeout,proto3" json:"file_sync_http_client_timeout,omitempty"` + FromEngineName string `protobuf:"bytes,6,opt,name=from_engine_name,json=fromEngineName,proto3" json:"from_engine_name,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -702,9 +711,9 @@ func (m *EngineSnapshotCloneRequest) GetProxyEngineRequest() *ProxyEngineRequest return nil } -func (m *EngineSnapshotCloneRequest) GetFromController() string { +func (m *EngineSnapshotCloneRequest) GetFromEngineAddress() string { if m != nil { - return m.FromController + return m.FromEngineAddress } return "" } @@ -730,6 +739,13 @@ func (m *EngineSnapshotCloneRequest) GetFileSyncHttpClientTimeout() int32 { return 0 } +func (m *EngineSnapshotCloneRequest) GetFromEngineName() string { + if m != nil { + return m.FromEngineName + } + return "" +} + type EngineSnapshotCloneStatusProxyResponse struct { Status map[string]*ptypes.SnapshotCloneStatusResponse `protobuf:"bytes,1,rep,name=status,proto3" json:"status,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -996,6 +1012,7 @@ type EngineSnapshotBackupStatusRequest struct { ProxyEngineRequest *ProxyEngineRequest `protobuf:"bytes,1,opt,name=proxy_engine_request,json=proxyEngineRequest,proto3" json:"proxy_engine_request,omitempty"` BackupName string `protobuf:"bytes,2,opt,name=backup_name,json=backupName,proto3" json:"backup_name,omitempty"` ReplicaAddress string `protobuf:"bytes,3,opt,name=replica_address,json=replicaAddress,proto3" json:"replica_address,omitempty"` + ReplicaName string `protobuf:"bytes,4,opt,name=replica_name,json=replicaName,proto3" json:"replica_name,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1047,6 +1064,13 @@ func (m *EngineSnapshotBackupStatusRequest) GetReplicaAddress() string { return "" } +func (m *EngineSnapshotBackupStatusRequest) GetReplicaName() string { + if m != nil { + return m.ReplicaName + } + return "" +} + type EngineSnapshotBackupStatusProxyResponse struct { BackupUrl string `protobuf:"bytes,1,opt,name=backup_url,json=backupUrl,proto3" json:"backup_url,omitempty"` Error string `protobuf:"bytes,2,opt,name=error,proto3" json:"error,omitempty"` @@ -1519,6 +1543,7 @@ func (m *EngineReplicaListProxyResponse) GetReplicaList() *ptypes.ReplicaListRep type EngineReplicaVerifyRebuildRequest struct { ProxyEngineRequest *ProxyEngineRequest `protobuf:"bytes,1,opt,name=proxy_engine_request,json=proxyEngineRequest,proto3" json:"proxy_engine_request,omitempty"` ReplicaAddress string `protobuf:"bytes,2,opt,name=replica_address,json=replicaAddress,proto3" json:"replica_address,omitempty"` + ReplicaName string `protobuf:"bytes,3,opt,name=replica_name,json=replicaName,proto3" json:"replica_name,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1563,6 +1588,13 @@ func (m *EngineReplicaVerifyRebuildRequest) GetReplicaAddress() string { return "" } +func (m *EngineReplicaVerifyRebuildRequest) GetReplicaName() string { + if m != nil { + return m.ReplicaName + } + return "" +} + type EngineReplicaRebuildStatusProxyResponse struct { Status map[string]*ptypes.ReplicaRebuildStatusResponse `protobuf:"bytes,1,rep,name=status,proto3" json:"status,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -1945,152 +1977,153 @@ func init() { } var fileDescriptor_c29cfec1128f1245 = []byte{ - // 2308 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0x4f, 0x73, 0x1c, 0x47, - 0x15, 0xaf, 0xd5, 0x6a, 0x57, 0xbb, 0x6f, 0xf5, 0x2f, 0x6d, 0xa1, 0xac, 0x57, 0x71, 0x22, 0x8f, - 0x63, 0xcb, 0x2e, 0xa2, 0xdd, 0x42, 0xa6, 0x82, 0xed, 0x5c, 0xec, 0xc8, 0xb2, 0xad, 0xd8, 0x22, - 0x61, 0x14, 0x1b, 0xa8, 0x90, 0x4c, 0x8d, 0x66, 0x7b, 0x77, 0x07, 0xcd, 0x3f, 0x7a, 0x7a, 0x84, - 0xc5, 0x81, 0x82, 0xcf, 0xc0, 0x05, 0xaa, 0xa0, 0x8a, 0x0b, 0x5f, 0x00, 0x8a, 0x0b, 0x1c, 0x38, - 0x70, 0xe6, 0x1e, 0x8a, 0x2a, 0x0e, 0x7c, 0x05, 0xbe, 0x00, 0xd5, 0x7f, 0x66, 0x76, 0x7a, 0xb6, - 0x67, 0x57, 0x0a, 0xb5, 0x95, 0xdb, 0xcc, 0xeb, 0xd7, 0xef, 0xfd, 0xfa, 0xf5, 0xfb, 0xd7, 0xdd, - 0xb0, 0x3f, 0x74, 0xe9, 0x28, 0x39, 0xe9, 0x3a, 0xa1, 0xdf, 0xf3, 0xc2, 0x60, 0x38, 0x0a, 0x49, - 0x90, 0x7d, 0xec, 0xba, 0x41, 0x4c, 0xed, 0xc0, 0xc1, 0xbb, 0xbe, 0x1d, 0xd8, 0x43, 0x4c, 0x7a, - 0xd1, 0xe9, 0xb0, 0xe7, 0xfa, 0x24, 0x72, 0x7a, 0x11, 0x09, 0x5f, 0x9f, 0x77, 0x23, 0x12, 0xd2, - 0x10, 0xd5, 0x38, 0xa9, 0xb3, 0x35, 0x0c, 0xc3, 0xa1, 0x87, 0x7b, 0x9c, 0x78, 0x92, 0x0c, 0x7a, - 0xd8, 0x8f, 0xa8, 0xe4, 0xe9, 0x3c, 0x9a, 0xaa, 0x08, 0x07, 0x43, 0x37, 0x90, 0x33, 0x7b, 0x11, - 0x3d, 0x8f, 0x70, 0xdc, 0x73, 0xc2, 0x80, 0x92, 0xd0, 0xf3, 0x30, 0x91, 0x22, 0x1e, 0x5e, 0x5a, - 0x44, 0x7c, 0x1e, 0x38, 0xf6, 0x10, 0x07, 0x54, 0x4a, 0x78, 0xfc, 0x55, 0x57, 0xeb, 0x84, 0xbe, - 0x1f, 0x06, 0x42, 0x8a, 0xf1, 0xdb, 0x0a, 0xa0, 0x4f, 0xd8, 0xf2, 0x0f, 0xb8, 0x4a, 0x13, 0xff, - 0x24, 0xc1, 0x31, 0x45, 0x6d, 0x58, 0xb2, 0xfb, 0x7d, 0x82, 0xe3, 0xb8, 0x5d, 0xd9, 0xae, 0xdc, - 0x6e, 0x9a, 0xe9, 0x2f, 0x7a, 0x0e, 0x1b, 0x27, 0xb6, 0x73, 0x8a, 0x83, 0xbe, 0x15, 0xd3, 0x90, - 0x60, 0xab, 0x4f, 0xdc, 0x33, 0x4c, 0xda, 0x0b, 0xdb, 0x95, 0xdb, 0xab, 0x7b, 0x57, 0xbb, 0x5c, - 0x47, 0xf7, 0x43, 0xc1, 0x72, 0xcc, 0x38, 0x1e, 0x73, 0x06, 0x13, 0x9d, 0x4c, 0xd0, 0xd0, 0x3b, - 0xd0, 0x12, 0x4b, 0xb5, 0x02, 0xdb, 0xc7, 0xed, 0x2a, 0x57, 0x05, 0x82, 0xf4, 0x5d, 0xdb, 0xc7, - 0xc6, 0x11, 0x74, 0x04, 0xb0, 0x57, 0x98, 0xc4, 0x6e, 0x18, 0x70, 0xa8, 0x26, 0x8e, 0xa3, 0x30, - 0x88, 0x31, 0xea, 0xc1, 0xd2, 0x99, 0xa0, 0x73, 0x94, 0xad, 0xbd, 0x6f, 0x74, 0x85, 0xb1, 0xba, - 0x92, 0xfd, 0xe3, 0x84, 0x46, 0x09, 0x35, 0x53, 0x2e, 0xe3, 0x09, 0xbc, 0x25, 0xc5, 0x85, 0x5e, - 0xe2, 0xe3, 0xa7, 0x98, 0xaa, 0x02, 0x6f, 0x41, 0xfd, 0x8c, 0x8f, 0x48, 0x79, 0xab, 0x99, 0x3c, - 0x4e, 0x35, 0xe5, 0xa8, 0xf1, 0xbb, 0x0a, 0x5c, 0xcd, 0x0b, 0x3a, 0x78, 0x1d, 0xd9, 0x41, 0x3f, - 0x35, 0xde, 0x73, 0xd8, 0xe0, 0x1e, 0x65, 0xc9, 0xb5, 0x11, 0x41, 0x97, 0x32, 0x53, 0x13, 0x4d, - 0x5a, 0xdd, 0x44, 0xd1, 0xe4, 0x4e, 0xdc, 0x85, 0x3a, 0xe6, 0xd2, 0xb9, 0x85, 0x5b, 0x7b, 0x5b, - 0x2a, 0x24, 0x45, 0xb3, 0x29, 0x59, 0x8d, 0xbf, 0x54, 0x60, 0x3b, 0x8f, 0xef, 0x09, 0x09, 0x03, - 0xca, 0x6d, 0x6f, 0x13, 0x3a, 0x17, 0x98, 0x87, 0xb0, 0x3a, 0x90, 0x4a, 0xac, 0x98, 0x69, 0x91, - 0x70, 0x0d, 0x15, 0xae, 0x0e, 0x88, 0xb9, 0x32, 0xc8, 0x53, 0x8d, 0x3f, 0x56, 0x60, 0x2b, 0x0f, - 0xfe, 0x38, 0xb0, 0xa3, 0x78, 0x14, 0xce, 0x07, 0xf7, 0x13, 0x58, 0x8b, 0xa5, 0x7c, 0x4b, 0x6e, - 0xbd, 0x00, 0x7e, 0x4d, 0x05, 0x5e, 0x00, 0x61, 0xae, 0xa6, 0xb3, 0xc4, 0xb0, 0xf1, 0x23, 0xb8, - 0xae, 0xc3, 0xac, 0xba, 0xd7, 0x77, 0xa0, 0x91, 0x4e, 0x93, 0x68, 0xb7, 0xca, 0xb4, 0x44, 0xde, - 0xb9, 0x99, 0x31, 0x1b, 0xff, 0xac, 0x40, 0x2f, 0x2f, 0xfe, 0x65, 0xe0, 0xdb, 0xd1, 0x91, 0x4d, - 0x4e, 0xd9, 0x84, 0xfd, 0x91, 0xed, 0x06, 0x26, 0xf6, 0xc3, 0x33, 0xdc, 0x3f, 0xc6, 0xf3, 0x31, - 0xd3, 0x0f, 0x61, 0x2d, 0x61, 0x3a, 0x2d, 0xdf, 0x26, 0xa7, 0x16, 0xc3, 0x25, 0xcd, 0xf4, 0x2d, - 0x75, 0x01, 0x17, 0x00, 0x66, 0xae, 0x24, 0x79, 0x26, 0xe3, 0xef, 0x15, 0x78, 0x47, 0x28, 0x4b, - 0x57, 0xff, 0xc2, 0x8d, 0x0b, 0x86, 0x7b, 0x0a, 0xb5, 0xbe, 0x1b, 0x9f, 0xb2, 0x64, 0x54, 0xe5, - 0x4a, 0x05, 0xf8, 0x19, 0xd3, 0xba, 0x8f, 0xd9, 0x9c, 0x83, 0x80, 0x92, 0x73, 0x53, 0xcc, 0xef, - 0x7c, 0x1f, 0x60, 0x4c, 0x44, 0xeb, 0x50, 0x3d, 0xc5, 0xe7, 0x32, 0xc3, 0xb1, 0x4f, 0x74, 0x17, - 0x6a, 0x67, 0xb6, 0x97, 0x8c, 0x9d, 0x40, 0xa7, 0x88, 0x49, 0x38, 0x0c, 0x06, 0xa1, 0x29, 0x78, - 0x1f, 0x2c, 0xdc, 0xab, 0x18, 0x7f, 0xaa, 0xc2, 0xa6, 0x9e, 0x0b, 0x21, 0x58, 0xe4, 0xd9, 0x4d, - 0xa8, 0xe1, 0xdf, 0x68, 0x13, 0xea, 0x91, 0x4d, 0x70, 0x20, 0xc2, 0xa4, 0x69, 0xca, 0x3f, 0xf4, - 0x14, 0x1a, 0xce, 0xc8, 0xf5, 0xfa, 0x04, 0x07, 0xed, 0x2a, 0x5f, 0xeb, 0x37, 0xa7, 0x42, 0xe8, - 0xee, 0x4b, 0x6e, 0xb1, 0xca, 0x6c, 0x32, 0x4b, 0xe0, 0x44, 0x58, 0xbe, 0xbd, 0xb8, 0x5d, 0xb9, - 0xdd, 0x30, 0xd3, 0x5f, 0x74, 0x1d, 0x96, 0x93, 0x18, 0x13, 0xcb, 0x21, 0xd8, 0xa6, 0xb8, 0xdf, - 0xae, 0xf1, 0xe1, 0x16, 0xa3, 0xed, 0x0b, 0x12, 0x9b, 0x9c, 0x8e, 0xd6, 0x45, 0xf6, 0x97, 0xbf, - 0x6c, 0x2d, 0xb1, 0xfb, 0x33, 0xdc, 0x5e, 0x12, 0x6b, 0x61, 0xdf, 0xe8, 0x11, 0xd4, 0x3d, 0xfb, - 0x04, 0x7b, 0x71, 0xbb, 0xc1, 0x11, 0xdf, 0x99, 0x8e, 0xf8, 0x05, 0xe7, 0x15, 0x78, 0xe5, 0xc4, - 0xce, 0x07, 0xb0, 0xa2, 0x2c, 0x44, 0xb3, 0x33, 0x1b, 0xf9, 0x9d, 0x69, 0xe4, 0x4c, 0xdf, 0xb9, - 0x0f, 0xad, 0x9c, 0xcc, 0x59, 0x53, 0x9b, 0xf9, 0x5d, 0xfb, 0x79, 0x9a, 0x69, 0xc6, 0x81, 0x77, - 0x86, 0xe7, 0x94, 0x21, 0x53, 0x37, 0x58, 0x18, 0xbb, 0x81, 0xf1, 0xeb, 0x4a, 0x5a, 0xdf, 0xb2, - 0x84, 0x91, 0x90, 0x21, 0x9e, 0x8b, 0xfe, 0x5d, 0xb8, 0x12, 0x9f, 0xba, 0x91, 0xe5, 0x0e, 0x2c, - 0x37, 0xb0, 0x22, 0x12, 0x0e, 0x79, 0x79, 0x17, 0xe6, 0x5c, 0x67, 0x43, 0x87, 0x83, 0x43, 0x56, - 0x60, 0x39, 0xdd, 0xf8, 0x57, 0x05, 0x6e, 0x69, 0xa0, 0x1d, 0x53, 0x9b, 0x26, 0xb1, 0x1a, 0x9d, - 0xdf, 0x83, 0x7a, 0xcc, 0xc9, 0x32, 0x3c, 0xef, 0x6b, 0x1d, 0xa0, 0x6c, 0x7a, 0x57, 0xd0, 0xa4, - 0x43, 0x08, 0x41, 0x9d, 0x2f, 0xa0, 0x95, 0x23, 0x6b, 0xf6, 0xf4, 0xbe, 0x1a, 0xa8, 0x37, 0xd2, - 0x34, 0xa4, 0xd1, 0x96, 0x2a, 0xca, 0x6f, 0xfc, 0x5f, 0x17, 0x8a, 0x86, 0xdf, 0xf7, 0xc2, 0x60, - 0x3e, 0x86, 0xdf, 0x81, 0xb5, 0x01, 0x09, 0x7d, 0x6b, 0xdc, 0x03, 0x4a, 0x1f, 0x60, 0x15, 0xd3, - 0xdf, 0xcf, 0xa8, 0xe8, 0x06, 0xac, 0x64, 0xb5, 0x28, 0xd7, 0x0f, 0x2d, 0xa7, 0x44, 0xd6, 0x11, - 0xa1, 0x87, 0x70, 0x0d, 0xbf, 0x8e, 0x42, 0x42, 0x2d, 0xd6, 0x4f, 0xb9, 0xc1, 0xd0, 0x72, 0x7d, - 0x7b, 0x88, 0xd9, 0xb6, 0xe2, 0xd7, 0x6e, 0x4c, 0x65, 0xb8, 0x5f, 0x15, 0x4c, 0x1f, 0x0a, 0x9e, - 0x43, 0xc6, 0x72, 0x38, 0x38, 0x60, 0x0c, 0x4c, 0xc2, 0xc0, 0xf5, 0xb0, 0xc5, 0x1a, 0x4a, 0x6b, - 0x44, 0x69, 0x64, 0x39, 0x9e, 0x8b, 0x03, 0x6a, 0x51, 0xd7, 0xc7, 0x61, 0x42, 0x79, 0x46, 0xa8, - 0x99, 0x57, 0x19, 0xd3, 0xf1, 0x79, 0xe0, 0x3c, 0xa3, 0x34, 0xda, 0xe7, 0x1c, 0x9f, 0x0a, 0x06, - 0x8d, 0x6f, 0x70, 0xeb, 0x7d, 0x75, 0xdf, 0x28, 0x9b, 0x3e, 0x1f, 0xdf, 0xc8, 0x69, 0xd3, 0xf9, - 0xc6, 0x2f, 0x2a, 0x93, 0x59, 0x81, 0xa5, 0xce, 0xb9, 0x38, 0xc7, 0x06, 0xd4, 0xd8, 0x56, 0xb3, - 0x38, 0xac, 0xb2, 0xdc, 0xc4, 0x7f, 0x8c, 0x2f, 0x17, 0x8b, 0x10, 0xd8, 0x46, 0x26, 0xd1, 0xbc, - 0x12, 0x13, 0x0e, 0xce, 0x44, 0xf6, 0x6e, 0x9a, 0xfc, 0x9b, 0x35, 0xe6, 0x27, 0x5c, 0xa3, 0x95, - 0xcb, 0x59, 0x20, 0x48, 0xdc, 0x0d, 0x2f, 0xe4, 0xab, 0x37, 0x60, 0x45, 0x4a, 0xa1, 0x36, 0x19, - 0x62, 0xe1, 0x9b, 0x4d, 0x73, 0x59, 0x10, 0x3f, 0xe5, 0x34, 0xf4, 0x1e, 0x20, 0xd5, 0x93, 0xb9, - 0xb8, 0x1a, 0xe7, 0x5c, 0x3f, 0xc9, 0xf9, 0x2f, 0x17, 0xf9, 0x6d, 0xd8, 0x54, 0xb9, 0x9d, 0x11, - 0x76, 0x4e, 0xe3, 0xc4, 0x97, 0x95, 0x6a, 0x23, 0x3f, 0x63, 0x5f, 0x8e, 0xa1, 0x27, 0x59, 0x89, - 0x5a, 0xe2, 0x5e, 0xd8, 0xd5, 0x7a, 0xa1, 0x62, 0x63, 0x5d, 0x9d, 0x42, 0xbb, 0x80, 0x9c, 0xd0, - 0x8f, 0x58, 0x82, 0x74, 0xc3, 0xc0, 0xf2, 0x31, 0x1d, 0x85, 0xfd, 0x76, 0x93, 0x6b, 0x7e, 0x23, - 0x37, 0x72, 0xc4, 0x07, 0xd0, 0x1d, 0x58, 0x77, 0xc2, 0xc0, 0x49, 0x08, 0xab, 0xed, 0x96, 0xe7, - 0xfa, 0x2e, 0x6d, 0x03, 0x0f, 0xae, 0xb5, 0x31, 0xfd, 0x05, 0x23, 0x33, 0x2b, 0xb0, 0xe3, 0x14, - 0x5f, 0x91, 0x67, 0xc7, 0xb1, 0xb0, 0x42, 0x4b, 0x58, 0x41, 0x8e, 0xec, 0xb3, 0x01, 0x66, 0x85, - 0xff, 0xa7, 0xe4, 0xfd, 0xb2, 0x92, 0x76, 0xaa, 0xea, 0xb2, 0xd5, 0xb0, 0xdd, 0x82, 0xa6, 0xdc, - 0x39, 0xb7, 0x2f, 0xe5, 0x36, 0x04, 0xe1, 0xb0, 0x2f, 0x7a, 0x8b, 0xc8, 0x73, 0x1d, 0x5b, 0x8a, - 0x4f, 0x7f, 0xd1, 0x4d, 0x58, 0x75, 0x63, 0xcb, 0x0d, 0x1c, 0x82, 0x7d, 0x1c, 0x50, 0xdb, 0xe3, - 0x6e, 0xd1, 0x30, 0x57, 0xdc, 0xf8, 0x70, 0x4c, 0x64, 0xc7, 0x13, 0x2d, 0x86, 0x34, 0x26, 0xe7, - 0xe0, 0xe4, 0x33, 0x1d, 0x7a, 0x07, 0xd6, 0xe4, 0x2a, 0xac, 0xf4, 0xe4, 0x2b, 0x5c, 0x7a, 0x55, - 0x92, 0x1f, 0x09, 0xaa, 0xf1, 0xef, 0x0a, 0xec, 0x94, 0x83, 0x57, 0xcd, 0x78, 0x0d, 0xa4, 0x0a, - 0x2b, 0x21, 0x9e, 0xb4, 0xa3, 0x34, 0xec, 0x4b, 0xe2, 0xb1, 0x5d, 0xc2, 0x84, 0x84, 0x69, 0x3d, - 0x10, 0x3f, 0xa8, 0x03, 0x8d, 0xac, 0x3a, 0x57, 0xb9, 0xb7, 0x64, 0xff, 0x93, 0x61, 0xb7, 0xa8, - 0x09, 0xbb, 0x0d, 0xa8, 0xb1, 0x54, 0x99, 0x06, 0x91, 0xf8, 0xd1, 0x2d, 0xb0, 0xae, 0x5d, 0xe0, - 0x7f, 0xb3, 0xa6, 0x24, 0x0d, 0x08, 0x7e, 0xd0, 0x9f, 0x6b, 0xee, 0x59, 0xc8, 0xe5, 0x9e, 0x75, - 0xa8, 0x32, 0x6b, 0x09, 0xeb, 0xb3, 0x4f, 0xd6, 0x2d, 0x2b, 0x09, 0x44, 0xfe, 0xb1, 0x4d, 0x15, - 0x67, 0xb6, 0x7c, 0xce, 0x00, 0x41, 0xe2, 0x96, 0xd0, 0x05, 0x60, 0x5d, 0x1b, 0x80, 0xc6, 0xc3, - 0xf4, 0xc4, 0xac, 0x2c, 0x5a, 0xdd, 0xce, 0xb7, 0xa0, 0x49, 0xed, 0xf8, 0xf4, 0x80, 0xef, 0x19, - 0x5b, 0xef, 0xb2, 0x39, 0x26, 0x18, 0x5f, 0x66, 0x55, 0x51, 0x11, 0x71, 0xf9, 0xaa, 0x38, 0x6b, - 0xba, 0xb6, 0x2a, 0x7e, 0x36, 0xab, 0x2a, 0xbe, 0xaf, 0x56, 0xc5, 0xed, 0x59, 0x2a, 0xf3, 0x49, - 0xe3, 0xf7, 0x0b, 0xe9, 0x7d, 0x87, 0x86, 0x91, 0x9d, 0x28, 0xdc, 0xd8, 0x22, 0x9c, 0xe6, 0x06, - 0x43, 0xae, 0xb4, 0x61, 0xb6, 0xdc, 0xd8, 0x4c, 0x49, 0xcc, 0x6f, 0x3d, 0x3b, 0xa6, 0x92, 0x09, - 0xf7, 0xa5, 0xc7, 0x2f, 0x33, 0xa2, 0x14, 0xd6, 0x47, 0xf7, 0xa0, 0x9d, 0x6e, 0x55, 0x26, 0xcc, - 0x12, 0xd1, 0x22, 0xbd, 0x61, 0x53, 0x8e, 0x67, 0x82, 0x05, 0x1c, 0x25, 0x64, 0x16, 0x0b, 0x21, - 0x93, 0x05, 0x59, 0xad, 0x10, 0x64, 0xac, 0xbf, 0xe1, 0x7e, 0x23, 0xc2, 0x20, 0xfb, 0x1f, 0xc7, - 0xcf, 0x52, 0x3e, 0x7e, 0xd4, 0x58, 0x6e, 0x14, 0x62, 0xd9, 0xf8, 0xcf, 0x02, 0xbc, 0x99, 0xfa, - 0x76, 0x1a, 0x4e, 0xf3, 0x6a, 0x27, 0x8b, 0x71, 0xbc, 0xa0, 0x8b, 0x63, 0x91, 0xa6, 0xb9, 0x69, - 0x65, 0x16, 0x4e, 0x7f, 0xb3, 0x53, 0x1c, 0x33, 0x55, 0x55, 0x9e, 0xe2, 0xae, 0xc3, 0x72, 0x6a, - 0x7c, 0x3e, 0x56, 0xe3, 0x63, 0x2d, 0x49, 0x3b, 0x66, 0x2c, 0x5b, 0xd0, 0x1c, 0xb0, 0x4d, 0x64, - 0x8d, 0x23, 0x37, 0x5a, 0xc3, 0x6c, 0x30, 0x02, 0x6b, 0x12, 0x67, 0x77, 0x95, 0x4b, 0x33, 0xba, - 0x4a, 0x86, 0x20, 0x5d, 0x18, 0xdf, 0x16, 0x61, 0xe2, 0x96, 0xa4, 0xf1, 0xeb, 0xc0, 0xcf, 0xe1, - 0x6d, 0xc5, 0xc6, 0x93, 0x37, 0x05, 0x1f, 0x8c, 0x85, 0x78, 0x6e, 0x66, 0xe2, 0x76, 0xda, 0x02, - 0xe6, 0xe6, 0x89, 0x3b, 0x96, 0x54, 0x3c, 0xa3, 0x18, 0xbf, 0xc9, 0xea, 0x92, 0xe4, 0x7b, 0x85, - 0x89, 0x3b, 0x38, 0x37, 0xf1, 0x49, 0xe2, 0x7a, 0x5f, 0xef, 0x6e, 0xe6, 0xca, 0x8e, 0xc4, 0x26, - 0x51, 0xe9, 0xd2, 0x8b, 0x59, 0x48, 0x2f, 0x0f, 0x94, 0x58, 0x9f, 0x39, 0x5f, 0x9b, 0x5f, 0xac, - 0x59, 0xf9, 0xe5, 0x81, 0x9a, 0x5f, 0xde, 0x2d, 0x98, 0x5c, 0x51, 0xa7, 0x6b, 0xbb, 0xff, 0x9c, - 0x95, 0x9d, 0x6c, 0xc6, 0xdc, 0xba, 0xee, 0x0b, 0xc7, 0x50, 0xd1, 0x27, 0xab, 0x93, 0x3e, 0xf9, - 0xb7, 0x4a, 0xc1, 0x29, 0x8f, 0xc2, 0x3e, 0x7e, 0x19, 0xf5, 0x6d, 0xfa, 0x35, 0x63, 0xdf, 0x81, - 0x45, 0x3f, 0xec, 0x0b, 0xcc, 0xab, 0x7b, 0x57, 0x0a, 0xfb, 0xc1, 0x50, 0x9a, 0x9c, 0xc1, 0xf8, - 0x43, 0x76, 0x9b, 0x9d, 0x76, 0x34, 0xcf, 0xec, 0x78, 0x34, 0x17, 0xf0, 0x13, 0xfd, 0xcb, 0x82, - 0xa6, 0x7f, 0xd9, 0x84, 0x3a, 0xc1, 0x23, 0x3b, 0x1e, 0xc9, 0xbc, 0x25, 0xff, 0x8c, 0x5f, 0x4d, - 0xdc, 0x14, 0x32, 0x9c, 0x73, 0x6c, 0x1a, 0x2f, 0x82, 0x96, 0x95, 0xfd, 0x9b, 0x65, 0xa8, 0xd4, - 0xb0, 0xfc, 0xa4, 0x10, 0x96, 0xf7, 0xb4, 0xa7, 0x90, 0x92, 0xd9, 0xda, 0xa0, 0xfc, 0x7c, 0x56, - 0x50, 0xde, 0x53, 0x83, 0xd2, 0x28, 0x1e, 0x85, 0xf3, 0x06, 0x9c, 0x0c, 0xc9, 0x8f, 0xe0, 0x9a, - 0xc0, 0x76, 0x84, 0x29, 0x71, 0x9d, 0x78, 0xe2, 0xbd, 0xe4, 0x0e, 0x2c, 0xf9, 0x62, 0x48, 0x1a, - 0x78, 0x2d, 0x55, 0x20, 0x67, 0x98, 0xe9, 0xf8, 0xde, 0x3f, 0x90, 0xf2, 0xd0, 0x74, 0x8c, 0xc9, - 0x99, 0xeb, 0x30, 0x9b, 0xac, 0xb3, 0x4f, 0x4c, 0xe4, 0x8b, 0xcd, 0x53, 0x4c, 0x51, 0xf9, 0x2e, - 0x75, 0xae, 0x2b, 0x26, 0xd3, 0x3e, 0x0a, 0x3d, 0x87, 0x66, 0xf6, 0xba, 0x33, 0x4d, 0xd4, 0x0d, - 0x55, 0x94, 0xfe, 0x41, 0xe8, 0x19, 0x2c, 0xe7, 0xdf, 0x59, 0xd0, 0xb6, 0x66, 0x92, 0xf2, 0x04, - 0xd3, 0xd9, 0xec, 0x8a, 0x97, 0xc3, 0x6e, 0xfa, 0x72, 0xd8, 0x3d, 0xf0, 0x23, 0x7a, 0x8e, 0x5e, - 0xc1, 0x15, 0xcd, 0x13, 0x08, 0xda, 0xd1, 0x08, 0xd4, 0x3d, 0x92, 0x94, 0xca, 0x7d, 0x0e, 0x9b, - 0x85, 0x59, 0xa3, 0x84, 0xf6, 0xc3, 0x9f, 0x06, 0xd3, 0xd6, 0x5e, 0x26, 0x8c, 0x82, 0x31, 0xfb, - 0x1e, 0x1f, 0xbd, 0xaf, 0xc1, 0x7c, 0x81, 0x8b, 0xff, 0x52, 0xad, 0x5f, 0xc0, 0xaa, 0xfa, 0xfc, - 0x81, 0x0c, 0x8d, 0x86, 0xc2, 0x0b, 0x4c, 0xe7, 0xf6, 0x14, 0x9e, 0x62, 0xb7, 0xbd, 0x9c, 0x7f, - 0x23, 0x98, 0x66, 0x98, 0x5b, 0x17, 0x7b, 0x59, 0x40, 0x2f, 0x60, 0x55, 0xbd, 0x32, 0x2e, 0x40, - 0xd6, 0xde, 0x27, 0x97, 0x1a, 0xe0, 0x23, 0x58, 0x51, 0xee, 0x2d, 0xd1, 0xf5, 0xf2, 0x1b, 0xd4, - 0x59, 0xb2, 0x2c, 0xb8, 0xa2, 0xb9, 0x03, 0x9d, 0xb6, 0xe6, 0xdd, 0x4b, 0x5d, 0xd7, 0xe6, 0xc1, - 0xf2, 0x8b, 0xb4, 0x12, 0xb0, 0xf9, 0xfb, 0xd4, 0x8b, 0x80, 0xcd, 0x5d, 0xca, 0x5d, 0x1e, 0x6c, - 0xe9, 0xf5, 0xa3, 0xb2, 0x4f, 0xcc, 0x1f, 0x4b, 0xf7, 0x29, 0xd7, 0x6b, 0x94, 0xc2, 0x7d, 0x36, - 0x76, 0x24, 0x96, 0x38, 0x0b, 0xd9, 0x40, 0x53, 0x3c, 0x4b, 0x25, 0xfd, 0x18, 0xd0, 0x64, 0x0a, - 0x46, 0xb7, 0x66, 0x14, 0x84, 0x54, 0xea, 0x7b, 0x97, 0x29, 0x1c, 0x2c, 0xbc, 0xd4, 0x9b, 0x8a, - 0x12, 0x1b, 0x28, 0xd7, 0x5f, 0x85, 0xf0, 0x9a, 0x76, 0x57, 0x14, 0xc1, 0x86, 0xee, 0x26, 0x04, - 0x4d, 0x93, 0xa0, 0xae, 0xa7, 0x3b, 0x93, 0x53, 0xd5, 0xf8, 0x19, 0xac, 0x28, 0xe7, 0xd0, 0x82, - 0x0b, 0xea, 0xae, 0x2d, 0x3a, 0x3b, 0xe5, 0x2c, 0xaa, 0x70, 0x0b, 0xae, 0xe8, 0x0e, 0xb9, 0x17, - 0xf6, 0xc9, 0x99, 0x87, 0xff, 0xc7, 0x00, 0xe3, 0x23, 0x22, 0x7a, 0x5b, 0xd7, 0x9b, 0x8f, 0xcf, - 0x8e, 0xa5, 0x1e, 0xf4, 0x31, 0xb4, 0x72, 0x87, 0x99, 0x69, 0xf0, 0x6e, 0xea, 0x34, 0x4c, 0xa6, - 0xb4, 0x3e, 0xbc, 0xa9, 0xb6, 0xea, 0x6e, 0x30, 0x9c, 0xbd, 0xf6, 0xee, 0xe5, 0x8e, 0x16, 0xe8, - 0x07, 0xb0, 0xa1, 0x3b, 0x5b, 0x15, 0x9c, 0x65, 0xca, 0xf1, 0x6b, 0x5a, 0x12, 0x55, 0x0e, 0x0e, - 0x05, 0xa7, 0xd0, 0x1d, 0x2a, 0x4a, 0x65, 0x99, 0xf0, 0xc6, 0x44, 0x33, 0x8f, 0xb4, 0x76, 0x9c, - 0x68, 0xf6, 0x4b, 0x65, 0x1e, 0x01, 0x8c, 0xdb, 0xa8, 0x69, 0x26, 0x7d, 0x57, 0xd1, 0x53, 0xd2, - 0x7a, 0x9d, 0xd4, 0xb9, 0xf8, 0xbb, 0xff, 0x0b, 0x00, 0x00, 0xff, 0xff, 0xf7, 0x08, 0x2c, 0x42, - 0xf5, 0x24, 0x00, 0x00, + // 2324 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x19, 0x4d, 0x73, 0x1c, 0x47, + 0xb5, 0x56, 0xd2, 0xae, 0x56, 0x6f, 0xa5, 0xb5, 0xd2, 0x12, 0xca, 0x7a, 0x15, 0x27, 0xd6, 0x38, + 0xf1, 0x47, 0x11, 0xef, 0x16, 0x32, 0x15, 0x6c, 0xe7, 0x62, 0x47, 0x96, 0x6d, 0xc5, 0x16, 0x09, + 0xa3, 0xd8, 0x40, 0x85, 0x64, 0x6a, 0x34, 0xdb, 0xbb, 0x3b, 0x68, 0xbe, 0xe8, 0xe9, 0x15, 0x16, + 0x07, 0x0a, 0x7e, 0x03, 0x17, 0x2e, 0x54, 0x71, 0xe1, 0x0f, 0x40, 0x71, 0xa1, 0xa0, 0x38, 0x70, + 0xe6, 0x1e, 0x8a, 0x82, 0x03, 0x67, 0x6e, 0xfc, 0x01, 0xaa, 0xbf, 0x66, 0xa7, 0x67, 0x7b, 0x76, + 0xa5, 0xc0, 0x56, 0x6e, 0x33, 0xaf, 0x5f, 0xbf, 0xef, 0xf7, 0xfa, 0xf5, 0x6b, 0xd8, 0x1b, 0xf8, + 0x74, 0x38, 0x3a, 0xee, 0x78, 0x71, 0xd8, 0x0d, 0xe2, 0x68, 0x30, 0x8c, 0x49, 0x94, 0x7d, 0xdc, + 0xf6, 0xa3, 0x94, 0xba, 0x91, 0x87, 0x6f, 0x87, 0x6e, 0xe4, 0x0e, 0x30, 0xe9, 0x26, 0x27, 0x83, + 0xae, 0x1f, 0x92, 0xc4, 0xeb, 0x26, 0x24, 0x7e, 0x75, 0xd6, 0x49, 0x48, 0x4c, 0x63, 0x54, 0xe5, + 0xa0, 0xf6, 0xf6, 0x20, 0x8e, 0x07, 0x01, 0xee, 0x72, 0xe0, 0xf1, 0xa8, 0xdf, 0xc5, 0x61, 0x42, + 0x25, 0x4e, 0xfb, 0xe1, 0x54, 0x46, 0x38, 0x1a, 0xf8, 0x91, 0xdc, 0xd9, 0x4d, 0xe8, 0x59, 0x82, + 0xd3, 0xae, 0x17, 0x47, 0x94, 0xc4, 0x41, 0x80, 0x89, 0x24, 0xf1, 0xe0, 0xc2, 0x24, 0xd2, 0xb3, + 0xc8, 0x73, 0x07, 0x38, 0xa2, 0x92, 0xc2, 0xa3, 0x2f, 0xab, 0xad, 0x17, 0x87, 0x61, 0x1c, 0x09, + 0x2a, 0xd6, 0x9f, 0x2a, 0x80, 0x3e, 0x66, 0xea, 0xef, 0x73, 0x96, 0x36, 0xfe, 0xd1, 0x08, 0xa7, + 0x14, 0xb5, 0x60, 0xd9, 0xed, 0xf5, 0x08, 0x4e, 0xd3, 0x56, 0xe5, 0x6a, 0xe5, 0xe6, 0x8a, 0xad, + 0x7e, 0xd1, 0x33, 0xd8, 0x3c, 0x76, 0xbd, 0x13, 0x1c, 0xf5, 0x9c, 0x94, 0xc6, 0x04, 0x3b, 0x3d, + 0xe2, 0x9f, 0x62, 0xd2, 0x5a, 0xb8, 0x5a, 0xb9, 0xd9, 0xdc, 0xbd, 0xdc, 0xe1, 0x3c, 0x3a, 0x1f, + 0x08, 0x94, 0x23, 0x86, 0xf1, 0x88, 0x23, 0xd8, 0xe8, 0x78, 0x02, 0x86, 0xde, 0x82, 0x86, 0x50, + 0xd5, 0x89, 0xdc, 0x10, 0xb7, 0x16, 0x39, 0x2b, 0x10, 0xa0, 0x6f, 0xbb, 0x21, 0x66, 0x08, 0xa7, + 0x71, 0x30, 0x0a, 0x25, 0xc2, 0x92, 0x40, 0x10, 0x20, 0x86, 0x60, 0x1d, 0x42, 0x5b, 0x48, 0xfe, + 0x12, 0x93, 0xd4, 0x8f, 0x23, 0xae, 0x8b, 0x8d, 0xd3, 0x24, 0x8e, 0x52, 0x8c, 0xba, 0xb0, 0x7c, + 0x2a, 0xe0, 0x5c, 0x8d, 0xc6, 0xee, 0xd7, 0x3a, 0xc2, 0x9a, 0x1d, 0x89, 0xfe, 0xd1, 0x88, 0x26, + 0x23, 0x6a, 0x2b, 0x2c, 0xeb, 0x31, 0xbc, 0x21, 0xc9, 0x71, 0x16, 0x4f, 0x30, 0xd5, 0x09, 0x5e, + 0x87, 0x9a, 0x60, 0x2e, 0xe9, 0x35, 0x33, 0x7a, 0x1c, 0x6a, 0xcb, 0x55, 0xeb, 0x57, 0x15, 0xb8, + 0x9c, 0x27, 0xb4, 0xff, 0x2a, 0x71, 0xa3, 0x9e, 0xb2, 0xee, 0x33, 0xd8, 0xe4, 0x21, 0xe7, 0x48, + 0xe5, 0x89, 0x80, 0x4b, 0x9a, 0xca, 0x86, 0x93, 0x6e, 0xb1, 0x51, 0x32, 0xe9, 0xaa, 0x3b, 0x50, + 0xc3, 0x9c, 0x3a, 0x77, 0x41, 0x63, 0x77, 0x5b, 0x17, 0x49, 0xe3, 0x6c, 0x4b, 0x54, 0xeb, 0x0f, + 0x15, 0xb8, 0x9a, 0x97, 0xef, 0x31, 0x89, 0x23, 0xca, 0x9d, 0xe3, 0x12, 0x3a, 0x17, 0x31, 0x0f, + 0xa0, 0xd9, 0x97, 0x4c, 0x9c, 0x94, 0x71, 0x91, 0xe2, 0x5a, 0xba, 0xb8, 0x26, 0x41, 0xec, 0xb5, + 0x7e, 0x1e, 0x6a, 0xfd, 0xb6, 0x02, 0xdb, 0x79, 0xe1, 0x8f, 0x22, 0x37, 0x49, 0x87, 0xf1, 0x7c, + 0xe4, 0x7e, 0x0c, 0x97, 0x52, 0x49, 0xdf, 0x91, 0xae, 0x17, 0x82, 0x5f, 0xd1, 0x05, 0x2f, 0x08, + 0x61, 0x37, 0xd5, 0x2e, 0xb1, 0x6c, 0xfd, 0x00, 0x76, 0x4c, 0x32, 0xeb, 0xe1, 0xf5, 0x2d, 0xa8, + 0xab, 0x6d, 0x52, 0xda, 0xed, 0x32, 0x2e, 0x49, 0x70, 0x66, 0x67, 0xc8, 0xd6, 0xdf, 0x2a, 0xd0, + 0xcd, 0x93, 0x7f, 0x11, 0x85, 0x6e, 0x72, 0xe8, 0x92, 0x13, 0xb6, 0x61, 0x6f, 0xe8, 0xfa, 0x91, + 0x8d, 0xc3, 0xf8, 0x14, 0xf7, 0x8e, 0xf0, 0x7c, 0xcc, 0xf4, 0x7d, 0xb8, 0x34, 0x62, 0x3c, 0x9d, + 0xd0, 0x25, 0x27, 0x0e, 0x93, 0x4b, 0x9a, 0xe9, 0x1b, 0xba, 0x02, 0xe7, 0x10, 0xcc, 0x5e, 0x1b, + 0xe5, 0x91, 0xac, 0xbf, 0x54, 0xe0, 0x2d, 0xc1, 0x4c, 0x69, 0xff, 0xdc, 0x4f, 0x0b, 0x86, 0x7b, + 0x02, 0xd5, 0x9e, 0x9f, 0x9e, 0xb0, 0x6a, 0xb5, 0xc8, 0x99, 0x0a, 0xe1, 0x67, 0x6c, 0xeb, 0x3c, + 0x62, 0x7b, 0xf6, 0x23, 0x4a, 0xce, 0x6c, 0xb1, 0xbf, 0xfd, 0x5d, 0x80, 0x31, 0x10, 0xad, 0xc3, + 0xe2, 0x09, 0x3e, 0x93, 0x25, 0x90, 0x7d, 0xa2, 0x3b, 0x50, 0x3d, 0x75, 0x83, 0xd1, 0x38, 0x08, + 0x4c, 0x8c, 0x18, 0x85, 0x83, 0xa8, 0x1f, 0xdb, 0x02, 0xf7, 0xfe, 0xc2, 0xdd, 0x8a, 0xf5, 0xbb, + 0x45, 0xd8, 0x32, 0x63, 0x21, 0x04, 0x4b, 0xbc, 0xba, 0x09, 0x36, 0xfc, 0x1b, 0x6d, 0x41, 0x2d, + 0x71, 0x09, 0x8e, 0x44, 0x9a, 0xac, 0xd8, 0xf2, 0x0f, 0x3d, 0x81, 0xba, 0x37, 0xf4, 0x83, 0x1e, + 0xc1, 0x51, 0x6b, 0x91, 0xeb, 0xfa, 0xf5, 0xa9, 0x22, 0x74, 0xf6, 0x24, 0xb6, 0xd0, 0x32, 0xdb, + 0xcc, 0x2a, 0x3c, 0x11, 0x96, 0xe7, 0x55, 0xb5, 0x6e, 0xab, 0x5f, 0xb4, 0x03, 0xab, 0xa3, 0x14, + 0x13, 0xc7, 0x23, 0xd8, 0xa5, 0xb8, 0xd7, 0xaa, 0xf2, 0xe5, 0x06, 0x83, 0xed, 0x09, 0x10, 0xdb, + 0xac, 0x56, 0x6b, 0xe2, 0x78, 0x90, 0xbf, 0x4c, 0x97, 0xd4, 0xff, 0x09, 0x6e, 0x2d, 0x0b, 0x5d, + 0xd8, 0x37, 0x7a, 0x08, 0xb5, 0xc0, 0x3d, 0xc6, 0x41, 0xda, 0xaa, 0x73, 0x89, 0x6f, 0x4d, 0x97, + 0xf8, 0x39, 0xc7, 0x15, 0xf2, 0xca, 0x8d, 0xed, 0xf7, 0x61, 0x4d, 0x53, 0xc4, 0xe0, 0x99, 0xcd, + 0xbc, 0x67, 0xea, 0x39, 0xd3, 0xb7, 0xef, 0x41, 0x23, 0x47, 0x73, 0xd6, 0xd6, 0x95, 0xbc, 0xd7, + 0x7e, 0xaa, 0x2a, 0xcd, 0x38, 0xf1, 0x4e, 0xf1, 0x9c, 0x2a, 0xa4, 0x0a, 0x83, 0x85, 0x71, 0x18, + 0x58, 0xbf, 0xac, 0xa8, 0xf3, 0x2d, 0x2b, 0x18, 0x23, 0x32, 0xc0, 0x73, 0xe1, 0x7f, 0x1b, 0x36, + 0xd2, 0x13, 0x3f, 0x71, 0xfc, 0xbe, 0xe3, 0x47, 0x4e, 0x42, 0xe2, 0x01, 0x3f, 0xff, 0x85, 0x39, + 0xd7, 0xd9, 0xd2, 0x41, 0xff, 0x80, 0x1d, 0xb0, 0x1c, 0x6e, 0xfd, 0xbd, 0x02, 0xd7, 0x0d, 0xa2, + 0x1d, 0x51, 0x97, 0x8e, 0x52, 0x3d, 0x3b, 0xbf, 0x03, 0xb5, 0x94, 0x83, 0x65, 0x7a, 0xde, 0x33, + 0x06, 0x40, 0xd9, 0xf6, 0x8e, 0x80, 0xc9, 0x80, 0x10, 0x84, 0xda, 0x9f, 0x43, 0x23, 0x07, 0x36, + 0xf8, 0xf4, 0x9e, 0x9e, 0xa8, 0xd7, 0x54, 0x19, 0x32, 0x70, 0x53, 0x8c, 0xf2, 0x8e, 0xff, 0xf7, + 0x42, 0xd1, 0xf0, 0x7b, 0x41, 0x1c, 0xcd, 0xc7, 0xf0, 0x1d, 0xd8, 0xe8, 0x93, 0x38, 0x54, 0xb4, + 0x54, 0xe3, 0x25, 0xe2, 0xe0, 0x35, 0xb6, 0x24, 0xf0, 0x1f, 0xca, 0x16, 0xec, 0x1a, 0xac, 0x65, + 0x47, 0x52, 0xae, 0x6f, 0x5a, 0x55, 0x40, 0xde, 0x39, 0x3d, 0x80, 0x2b, 0xf8, 0x55, 0x12, 0x13, + 0xea, 0xb0, 0xbe, 0xcb, 0x8f, 0x06, 0x8e, 0x1f, 0xba, 0x03, 0xcc, 0xbc, 0x8b, 0x5f, 0xf9, 0x29, + 0x95, 0x59, 0x7f, 0x59, 0x20, 0x7d, 0x20, 0x70, 0x0e, 0x18, 0xca, 0x41, 0x7f, 0x9f, 0x21, 0x30, + 0x0a, 0x7d, 0x3f, 0xc0, 0x0e, 0x6b, 0x3c, 0x9d, 0x21, 0xa5, 0x89, 0xe3, 0x05, 0x3e, 0x8e, 0xa8, + 0x43, 0xfd, 0x10, 0xc7, 0x23, 0xca, 0x0b, 0x43, 0xd5, 0xbe, 0xcc, 0x90, 0x8e, 0xce, 0x22, 0xef, + 0x29, 0xa5, 0xc9, 0x1e, 0xc7, 0xf8, 0x44, 0x20, 0xa0, 0x9b, 0xb0, 0x9e, 0x57, 0x8c, 0xcb, 0x2a, + 0xea, 0x45, 0x73, 0xac, 0x15, 0x6f, 0xe3, 0x26, 0x83, 0x89, 0x9b, 0xfb, 0xcb, 0x07, 0x53, 0xd9, + 0xf6, 0xf9, 0x04, 0x53, 0x8e, 0x9b, 0x29, 0x98, 0x7e, 0x56, 0x99, 0x2c, 0x23, 0xac, 0xd6, 0xce, + 0x25, 0x9a, 0x36, 0xa1, 0xca, 0x0c, 0xcd, 0xe2, 0x67, 0x91, 0x15, 0x33, 0xfe, 0x63, 0x7d, 0xb1, + 0x54, 0x14, 0x81, 0xb9, 0x7c, 0x94, 0xcc, 0xab, 0x92, 0xe1, 0xe8, 0x54, 0x94, 0xfb, 0x15, 0x9b, + 0x7f, 0xb3, 0x4e, 0xfe, 0x98, 0x73, 0x74, 0x72, 0x45, 0x0e, 0x04, 0x88, 0x07, 0xec, 0xb9, 0xa2, + 0xfa, 0x1a, 0xac, 0x49, 0x2a, 0xd4, 0x25, 0x03, 0x4c, 0xe5, 0x8d, 0x60, 0x55, 0x00, 0x3f, 0xe1, + 0x30, 0xf4, 0x2e, 0x20, 0x3d, 0xe6, 0x39, 0xb9, 0x2a, 0xc7, 0x5c, 0x3f, 0xce, 0x45, 0x3a, 0x27, + 0xf9, 0x4d, 0xd8, 0xd2, 0xb1, 0xbd, 0x21, 0xf6, 0x4e, 0xd2, 0x51, 0x28, 0x43, 0x75, 0x33, 0xbf, + 0x63, 0x4f, 0xae, 0xa1, 0xc7, 0xd9, 0x99, 0xb6, 0xcc, 0xa3, 0xb0, 0x63, 0x8c, 0x42, 0xcd, 0xc6, + 0xa6, 0x83, 0x0d, 0xdd, 0x06, 0xe4, 0xc5, 0x61, 0xc2, 0xf2, 0xda, 0x8f, 0x23, 0x27, 0xc4, 0x74, + 0x18, 0xf7, 0x5a, 0x2b, 0x22, 0xf5, 0x73, 0x2b, 0x87, 0x7c, 0x01, 0xdd, 0x82, 0x75, 0x2f, 0x8e, + 0xbc, 0x11, 0x61, 0xcd, 0x80, 0x13, 0xf8, 0xa1, 0x4f, 0x5b, 0xc0, 0xd3, 0xf0, 0xd2, 0x18, 0xfe, + 0x9c, 0x81, 0x99, 0x15, 0xd8, 0x05, 0x8d, 0x6b, 0x14, 0xb8, 0x69, 0x2a, 0xac, 0xd0, 0x10, 0x56, + 0x90, 0x2b, 0x7b, 0x6c, 0x81, 0x59, 0xe1, 0x7f, 0x39, 0x23, 0x7f, 0x5e, 0x51, 0xad, 0xad, 0xae, + 0xb6, 0x9e, 0xb6, 0xdb, 0xb0, 0x22, 0x3d, 0xe7, 0xf7, 0x24, 0xdd, 0xba, 0x00, 0x1c, 0xf4, 0x44, + 0x33, 0x92, 0x04, 0xbe, 0xe7, 0x4a, 0xf2, 0xea, 0x17, 0xbd, 0x03, 0x4d, 0x3f, 0x75, 0xfc, 0xc8, + 0x23, 0x38, 0xc4, 0x11, 0x75, 0x03, 0x1e, 0x16, 0x75, 0x7b, 0xcd, 0x4f, 0x0f, 0xc6, 0x40, 0xeb, + 0x1f, 0x25, 0x32, 0xa8, 0x9c, 0x9c, 0x43, 0x90, 0xcf, 0x0c, 0xe8, 0x1b, 0x70, 0x49, 0x6a, 0x91, + 0x95, 0x74, 0x11, 0xd2, 0x4d, 0x09, 0x56, 0xf5, 0x7c, 0x07, 0x56, 0x15, 0x62, 0xee, 0x96, 0xdb, + 0x90, 0x30, 0x5e, 0x1f, 0xff, 0x59, 0x81, 0x1b, 0xe5, 0xfa, 0xe9, 0x96, 0xbe, 0x02, 0x52, 0x0a, + 0x67, 0x44, 0x02, 0x69, 0x6a, 0x69, 0xfb, 0x17, 0x24, 0x60, 0x8e, 0xc4, 0x84, 0xc4, 0x44, 0x39, + 0x92, 0xff, 0xa0, 0x36, 0xd4, 0xb3, 0x13, 0x7f, 0x91, 0x07, 0x54, 0xf6, 0x3f, 0x99, 0x99, 0x4b, + 0x86, 0xcc, 0xdc, 0x84, 0x2a, 0xab, 0xa6, 0x2a, 0xcf, 0xc4, 0x8f, 0xc9, 0x06, 0x35, 0x93, 0x0d, + 0xac, 0xff, 0x64, 0x8d, 0x8e, 0xca, 0x19, 0x3e, 0x5d, 0x98, 0x6b, 0x79, 0x5a, 0xc8, 0x95, 0xa7, + 0x75, 0x58, 0x64, 0xd6, 0x12, 0x0e, 0x62, 0x9f, 0xac, 0x03, 0xd7, 0x6a, 0x8c, 0xfc, 0x2b, 0x8e, + 0x24, 0xaa, 0xc5, 0x91, 0x84, 0x31, 0x47, 0x6b, 0xc6, 0x1c, 0xb5, 0x1e, 0xa8, 0x5b, 0xb8, 0xa6, + 0xb4, 0xee, 0xce, 0x37, 0x60, 0x85, 0xba, 0xe9, 0xc9, 0x3e, 0xf7, 0x19, 0xd3, 0x77, 0xd5, 0x1e, + 0x03, 0xac, 0x2f, 0xb2, 0x83, 0x53, 0x23, 0x71, 0xf1, 0x83, 0x73, 0xd6, 0x76, 0xe3, 0xc1, 0xf9, + 0xe9, 0xac, 0x83, 0xf3, 0x3d, 0xfd, 0xe0, 0xbc, 0x3a, 0x8b, 0x65, 0xbe, 0xae, 0xfc, 0x7a, 0x41, + 0xcd, 0x50, 0x0c, 0x88, 0x2c, 0x69, 0xfc, 0xd4, 0x21, 0x1c, 0xe6, 0x47, 0x03, 0xce, 0xb4, 0x6e, + 0x37, 0xfc, 0xd4, 0x56, 0x20, 0x16, 0xb7, 0x81, 0x9b, 0x52, 0x89, 0x84, 0x7b, 0x32, 0xe2, 0x57, + 0x19, 0x50, 0x12, 0xeb, 0xa1, 0xbb, 0xd0, 0x52, 0xae, 0xca, 0x88, 0x39, 0x22, 0x5b, 0x64, 0x34, + 0x6c, 0xc9, 0xf5, 0x8c, 0xb0, 0x10, 0x47, 0x4b, 0x99, 0xa5, 0x42, 0xca, 0x64, 0x49, 0x56, 0x2d, + 0x24, 0x19, 0x6b, 0x96, 0x72, 0x7d, 0x50, 0xf6, 0x3f, 0xce, 0x9f, 0xe5, 0x7c, 0xfe, 0xe8, 0xb9, + 0x5c, 0x2f, 0xe4, 0xb2, 0xf5, 0xaf, 0x05, 0x78, 0x5d, 0xc5, 0xb6, 0x4a, 0xa7, 0xb9, 0xa4, 0x8c, + 0x21, 0x8f, 0x17, 0x8c, 0xb5, 0x8c, 0x57, 0x72, 0x6e, 0x5a, 0x59, 0xa8, 0xd5, 0x6f, 0x76, 0x33, + 0x64, 0xa6, 0x5a, 0x94, 0x37, 0xc3, 0x1d, 0x58, 0x55, 0xc6, 0xe7, 0x6b, 0x55, 0xbe, 0xd6, 0x90, + 0xb0, 0x23, 0x86, 0xb2, 0x0d, 0x2b, 0x7d, 0xe6, 0x44, 0xd6, 0x85, 0x72, 0xa3, 0xd5, 0xed, 0x3a, + 0x03, 0xb0, 0x8e, 0x73, 0x76, 0x8b, 0xba, 0x3c, 0xab, 0x45, 0x2d, 0xd6, 0xde, 0xfa, 0x64, 0xed, + 0xfd, 0x0c, 0xde, 0xd4, 0x6c, 0x3c, 0x39, 0x7d, 0x78, 0x7f, 0x4c, 0x24, 0xf0, 0x33, 0x13, 0xb7, + 0x54, 0x97, 0x98, 0xdb, 0x27, 0xe6, 0x36, 0x8a, 0x3c, 0x83, 0x58, 0x7f, 0xcc, 0x8e, 0x2e, 0x89, + 0xf7, 0x12, 0x13, 0xbf, 0x7f, 0x66, 0xe3, 0xe3, 0x91, 0x1f, 0x7c, 0xc5, 0xde, 0x2c, 0x5a, 0x67, + 0x71, 0xda, 0xc9, 0x24, 0xc5, 0x97, 0x82, 0x9b, 0x2a, 0x90, 0x5d, 0xa8, 0x40, 0xf7, 0xb5, 0x72, + 0x30, 0x73, 0xbf, 0xb1, 0x04, 0x39, 0xb3, 0x4a, 0xd0, 0x7d, 0xbd, 0x04, 0xbd, 0x5d, 0xf0, 0x8a, + 0xc6, 0xce, 0xd4, 0xbc, 0xff, 0x3e, 0x3b, 0x99, 0xb2, 0x1d, 0x73, 0xeb, 0xdd, 0xff, 0x9f, 0x8e, + 0xf9, 0x73, 0xa5, 0x10, 0xb7, 0x87, 0x71, 0x0f, 0xbf, 0x48, 0x7a, 0x2e, 0xfd, 0x8a, 0x65, 0xbf, + 0x01, 0x4b, 0x61, 0xdc, 0x13, 0x32, 0x37, 0x77, 0x37, 0x0a, 0xfe, 0x60, 0x52, 0xda, 0x1c, 0xc1, + 0xfa, 0x4d, 0x36, 0x44, 0x57, 0x4d, 0xcf, 0x53, 0x37, 0x1d, 0xce, 0x45, 0xf8, 0x89, 0x16, 0x67, + 0xc1, 0xd0, 0xe2, 0x6c, 0x41, 0x8d, 0xe0, 0xa1, 0x9b, 0x0e, 0x65, 0x69, 0x93, 0x7f, 0xd6, 0x2f, + 0x26, 0x06, 0x94, 0x4c, 0xce, 0x39, 0xb6, 0x9e, 0xe7, 0x91, 0x96, 0x75, 0x06, 0xef, 0x94, 0x49, + 0xa5, 0xa7, 0xe5, 0xc7, 0x85, 0xb4, 0xbc, 0x6b, 0xbc, 0xcb, 0x94, 0xec, 0x36, 0x26, 0xe5, 0x67, + 0xb3, 0x92, 0xf2, 0xae, 0x9e, 0x94, 0x56, 0xf1, 0x42, 0x9d, 0x37, 0xe0, 0x64, 0x4a, 0x7e, 0x08, + 0x57, 0x84, 0x6c, 0x87, 0x98, 0x12, 0xdf, 0x4b, 0x27, 0x9e, 0x69, 0x6e, 0xc1, 0x72, 0x28, 0x96, + 0xa4, 0x81, 0x2f, 0x29, 0x06, 0x72, 0x87, 0xad, 0xd6, 0x77, 0xff, 0x8a, 0xb4, 0x07, 0xb0, 0x23, + 0x4c, 0x4e, 0x7d, 0x8f, 0xd9, 0x64, 0x9d, 0x7d, 0x62, 0x22, 0x1f, 0x8a, 0x9e, 0x60, 0x8a, 0xca, + 0xbd, 0xd4, 0xde, 0xd1, 0x4c, 0x66, 0x7c, 0x8b, 0x7a, 0x06, 0x2b, 0xd9, 0xa3, 0xd2, 0x34, 0x52, + 0xd7, 0x74, 0x52, 0xe6, 0x77, 0xa8, 0xa7, 0xb0, 0x9a, 0x7f, 0xde, 0x41, 0x57, 0x0d, 0x9b, 0xb4, + 0x97, 0x9f, 0xf6, 0x56, 0x47, 0xbc, 0x68, 0x76, 0xd4, 0x8b, 0x66, 0x67, 0x3f, 0x4c, 0xe8, 0x19, + 0x7a, 0x09, 0x1b, 0x86, 0x97, 0x17, 0x74, 0xc3, 0x40, 0xd0, 0xf4, 0x36, 0x53, 0x4a, 0xf7, 0x19, + 0x6c, 0x15, 0x76, 0x0d, 0x47, 0xb4, 0x17, 0xff, 0x38, 0x9a, 0xa6, 0x7b, 0x19, 0x31, 0x0a, 0xd6, + 0xec, 0xe7, 0x03, 0xf4, 0x9e, 0x41, 0xe6, 0x73, 0xbc, 0x37, 0x94, 0x72, 0xfd, 0x1c, 0x9a, 0xfa, + 0xab, 0x0b, 0xb2, 0x0c, 0x1c, 0x0a, 0x0f, 0x3f, 0xed, 0x9b, 0x53, 0x70, 0x8a, 0x0d, 0xf9, 0x6a, + 0xfe, 0x69, 0x62, 0x9a, 0x61, 0xae, 0x9f, 0xef, 0x41, 0x03, 0x3d, 0x87, 0xa6, 0x3e, 0xa9, 0x2e, + 0x88, 0x6c, 0x1c, 0x63, 0x97, 0x1a, 0xe0, 0x43, 0x58, 0xd3, 0xc6, 0xa5, 0x68, 0xa7, 0x7c, 0x70, + 0x3b, 0x8b, 0x96, 0x03, 0x1b, 0x86, 0xd1, 0xeb, 0x34, 0x9d, 0x6f, 0x5f, 0x68, 0x4a, 0x9c, 0x17, + 0x96, 0x8f, 0xe3, 0x4a, 0x84, 0xcd, 0x8f, 0x71, 0xcf, 0x23, 0x6c, 0x6e, 0xb4, 0x77, 0x71, 0x61, + 0x4b, 0x87, 0x98, 0x9a, 0x9f, 0x58, 0x3c, 0x96, 0xfa, 0x29, 0xd7, 0x6b, 0x94, 0x8a, 0xfb, 0x74, + 0x1c, 0x48, 0xac, 0x70, 0x16, 0xaa, 0x81, 0xe1, 0xf0, 0x2c, 0xa5, 0xf4, 0x43, 0x40, 0x93, 0x25, + 0x18, 0x5d, 0x9f, 0x71, 0x20, 0x28, 0xaa, 0xef, 0x5e, 0xe4, 0xe0, 0x60, 0xe9, 0xa5, 0x0f, 0x33, + 0x4a, 0x6c, 0xa0, 0x0d, 0xd1, 0x0a, 0xe9, 0x35, 0x6d, 0xe2, 0x94, 0xc0, 0xa6, 0x69, 0x58, 0x82, + 0xa6, 0x51, 0xd0, 0xf5, 0xe9, 0xcc, 0xc4, 0xd4, 0x39, 0x7e, 0x0a, 0x6b, 0xda, 0x55, 0xb5, 0x10, + 0x82, 0xa6, 0xc9, 0x46, 0xfb, 0x46, 0x39, 0x8a, 0x4e, 0xdc, 0x81, 0x0d, 0xd3, 0x3d, 0xf8, 0xdc, + 0x31, 0x39, 0x73, 0x3e, 0xf0, 0x08, 0x60, 0x7c, 0x8b, 0x44, 0x6f, 0x9a, 0x7a, 0xf3, 0xf1, 0xf5, + 0xb2, 0x34, 0x82, 0x3e, 0x82, 0x46, 0xee, 0xbe, 0x33, 0x4d, 0xbc, 0x77, 0x4c, 0x1c, 0x26, 0x4b, + 0x5a, 0x0f, 0x5e, 0xd7, 0x5b, 0x75, 0x3f, 0x1a, 0xcc, 0xd6, 0xbd, 0x73, 0xb1, 0xab, 0x05, 0xfa, + 0x1e, 0x6c, 0x9a, 0xae, 0x5f, 0x85, 0x60, 0x99, 0x72, 0x43, 0x9b, 0x56, 0x44, 0xb5, 0x8b, 0x43, + 0x21, 0x28, 0x4c, 0x97, 0x8a, 0x52, 0x5a, 0x36, 0xbc, 0x36, 0xd1, 0xcc, 0x23, 0xa3, 0x1d, 0x27, + 0x9a, 0xfd, 0x52, 0x9a, 0x87, 0x00, 0xe3, 0x36, 0x6a, 0x9a, 0x49, 0xdf, 0xd6, 0xf8, 0x94, 0xb4, + 0x5e, 0xc7, 0x35, 0x4e, 0xfe, 0xce, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xa3, 0x5a, 0xc8, 0x28, + 0x8d, 0x25, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/longhorn/longhorn-instance-manager/pkg/imrpc/proxy.proto b/vendor/github.com/longhorn/longhorn-instance-manager/pkg/imrpc/proxy.proto index 5ee1c663aa..d6b72cdb92 100644 --- a/vendor/github.com/longhorn/longhorn-instance-manager/pkg/imrpc/proxy.proto +++ b/vendor/github.com/longhorn/longhorn-instance-manager/pkg/imrpc/proxy.proto @@ -47,6 +47,7 @@ message ProxyEngineRequest{ string address = 1; BackendStoreDriver backend_store_driver = 2; string engine_name = 3; + string volume_name = 4; } message EngineVersionProxyResponse { @@ -119,10 +120,11 @@ message EngineSnapshotPurgeStatusProxyResponse { message EngineSnapshotCloneRequest { ProxyEngineRequest proxy_engine_request = 1; - string from_controller = 2; + string from_engine_address = 2; string snapshot_name = 3; bool export_backing_image_if_exist = 4; int32 file_sync_http_client_timeout = 5; + string from_engine_name = 6; } message EngineSnapshotCloneStatusProxyResponse { @@ -162,6 +164,7 @@ message EngineSnapshotBackupStatusRequest { string backup_name = 2; string replica_address = 3; + string replica_name = 4; } message EngineSnapshotBackupStatusProxyResponse { @@ -224,6 +227,7 @@ message EngineReplicaVerifyRebuildRequest { ProxyEngineRequest proxy_engine_request = 1; string replica_address = 2; + string replica_name = 3; } message EngineReplicaRebuildStatusProxyResponse { diff --git a/vendor/github.com/longhorn/longhorn-instance-manager/pkg/meta/version.go b/vendor/github.com/longhorn/longhorn-instance-manager/pkg/meta/version.go index e684823179..3ef877a07f 100644 --- a/vendor/github.com/longhorn/longhorn-instance-manager/pkg/meta/version.go +++ b/vendor/github.com/longhorn/longhorn-instance-manager/pkg/meta/version.go @@ -6,7 +6,7 @@ const ( InstanceManagerAPIMinVersion = 1 // InstanceManagerProxyAPIVersion is used for compatibility check for longhorn-manager - InstanceManagerProxyAPIVersion = 4 + InstanceManagerProxyAPIVersion = 5 InstanceManagerProxyAPIMinVersion = 1 // InstanceManagerDiskServiceAPIVersion used to communicate with the user e.g. longhorn-manager diff --git a/vendor/modules.txt b/vendor/modules.txt index 72ef6fed52..1a35f70f55 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -233,14 +233,14 @@ github.com/longhorn/go-iscsi-helper/util # github.com/longhorn/go-spdk-helper v0.0.0-20230626041832-c611b61f6b36 ## explicit; go 1.17 github.com/longhorn/go-spdk-helper/pkg/types -# github.com/longhorn/longhorn-engine v1.4.0-rc1.0.20230627154646-d1d6d308d37a +# github.com/longhorn/longhorn-engine v1.4.0-rc1.0.20230627154646-d1d6d308d37a => github.com/ejweber/longhorn-engine v0.0.0-20230719155844-7dd52065a622 ## explicit; go 1.20 github.com/longhorn/longhorn-engine/pkg/meta github.com/longhorn/longhorn-engine/pkg/replica/client github.com/longhorn/longhorn-engine/pkg/types github.com/longhorn/longhorn-engine/pkg/util github.com/longhorn/longhorn-engine/proto/ptypes -# github.com/longhorn/longhorn-instance-manager v1.4.0-rc1.0.20230627162235-cb966cd0f58a +# github.com/longhorn/longhorn-instance-manager v1.4.0-rc1.0.20230627162235-cb966cd0f58a => github.com/ejweber/longhorn-instance-manager v0.0.0-20230719160325-eef39617282f ## explicit; go 1.20 github.com/longhorn/longhorn-instance-manager/pkg/api github.com/longhorn/longhorn-instance-manager/pkg/client @@ -1502,3 +1502,5 @@ sigs.k8s.io/yaml # k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.27.1 # k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.27.1 # k8s.io/sample-controller => k8s.io/sample-controller v0.27.1 +# github.com/longhorn/longhorn-engine => github.com/ejweber/longhorn-engine v0.0.0-20230719155844-7dd52065a622 +# github.com/longhorn/longhorn-instance-manager => github.com/ejweber/longhorn-instance-manager v0.0.0-20230719160325-eef39617282f