From 511679934e5cce3091c9fbc52bd80f29b6df10a6 Mon Sep 17 00:00:00 2001 From: Eric Weber Date: Fri, 4 Aug 2023 14:12:36 -0500 Subject: [PATCH 1/7] Use versions of longhorn-engine and longhorn-instance-manager with engine identity flags and fields Signed-off-by: Eric Weber --- go.mod | 10 +- go.sum | 20 +- .../longhorn-engine/pkg/meta/version.go | 4 +- .../pkg/replica/client/client.go | 15 +- .../proto/ptypes/controller.pb.go | 179 ++++----- .../proto/ptypes/controller.proto | 1 + .../proto/ptypes/interceptor.go | 84 +++++ .../proto/ptypes/syncagent.pb.go | 219 +++++------ .../proto/ptypes/syncagent.proto | 1 + .../pkg/client/proxy_backup.go | 48 ++- .../pkg/client/proxy_metrics.go | 8 +- .../pkg/client/proxy_replica.go | 27 +- .../pkg/client/proxy_snapshot.go | 65 +++- .../pkg/client/proxy_volume.go | 25 +- .../pkg/imrpc/proxy.pb.go | 339 ++++++++++-------- .../pkg/imrpc/proxy.proto | 7 +- .../pkg/meta/version.go | 2 +- vendor/modules.txt | 10 +- 18 files changed, 652 insertions(+), 412 deletions(-) create mode 100644 vendor/github.com/longhorn/longhorn-engine/proto/ptypes/interceptor.go diff --git a/go.mod b/go.mod index e2b5c5ec12..8fc4b355c0 100644 --- a/go.mod +++ b/go.mod @@ -47,10 +47,10 @@ require ( github.com/longhorn/backing-image-manager v1.4.0-rc1.0.20230521151917-38ff27cc2cbb github.com/longhorn/backupstore v0.0.0-20230627040634-5b4f2d040e9d github.com/longhorn/go-iscsi-helper v0.0.0-20230529082528-4c3270590712 - github.com/longhorn/go-spdk-helper v0.0.0-20230626041832-c611b61f6b36 - github.com/longhorn/longhorn-engine v1.4.0-rc1.0.20230627154646-d1d6d308d37a - github.com/longhorn/longhorn-instance-manager v1.4.0-rc1.0.20230627162235-cb966cd0f58a - github.com/longhorn/longhorn-share-manager v1.4.0-rc1.0.20230531125701-c996c5a415b6 + github.com/longhorn/go-spdk-helper v0.0.0-20230802035240-e5fe21b6067f + github.com/longhorn/longhorn-engine v1.4.0-rc1.0.20230804172754-4d54af9e4ccf + github.com/longhorn/longhorn-instance-manager v1.4.0-rc1.0.20230804185319-08b3613c5311 + github.com/longhorn/longhorn-share-manager v1.5.1 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.15.0 github.com/rancher/dynamiclistener v0.3.1 @@ -126,7 +126,7 @@ require ( github.com/kr/pretty v0.3.1 // indirect github.com/kr/text v0.2.0 // indirect github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect - github.com/longhorn/longhorn-spdk-engine v0.0.0-20230627161406-64cb30ad3cf1 // indirect + github.com/longhorn/longhorn-spdk-engine v0.0.0-20230802040621-1fda4c2a0100 // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect diff --git a/go.sum b/go.sum index 7372d4eff9..f451627d9d 100644 --- a/go.sum +++ b/go.sum @@ -503,16 +503,16 @@ github.com/longhorn/backupstore v0.0.0-20230627040634-5b4f2d040e9d h1:sJBr2HsVp6 github.com/longhorn/backupstore v0.0.0-20230627040634-5b4f2d040e9d/go.mod h1:wiEYTbvxEAIUxAAY1DmvMeuFuGqwWmJTzfVhZiBKlNo= github.com/longhorn/go-iscsi-helper v0.0.0-20230529082528-4c3270590712 h1:IOBWtvr2ZdpQs3Fy8ecre3vZOBvmLJXme9qB6sqWdlw= 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= -github.com/longhorn/longhorn-spdk-engine v0.0.0-20230627161406-64cb30ad3cf1/go.mod h1:yZawDOljQHgh+ZzPCIL+xr5VXzK85bps8J42HJXHnyg= +github.com/longhorn/go-spdk-helper v0.0.0-20230802035240-e5fe21b6067f h1:aVnA0UfZWt8OSQDeoInxRHEMpIlZCjwHVB2bBb8gqNU= +github.com/longhorn/go-spdk-helper v0.0.0-20230802035240-e5fe21b6067f/go.mod h1:XoGXOYHw1KW3qdvTSimwY+Anyg5cPl6EVkjXxS25Upg= +github.com/longhorn/longhorn-engine v1.4.0-rc1.0.20230804172754-4d54af9e4ccf h1:uJi8hmGZSSF3y+lCNV0dnx/ua3O4WriVYNLAYXAPf3c= +github.com/longhorn/longhorn-engine v1.4.0-rc1.0.20230804172754-4d54af9e4ccf/go.mod h1:OOjKIyGpTxmZFWkn8N1G+H4pga0niuMgzrR/h5HUJNo= +github.com/longhorn/longhorn-instance-manager v1.4.0-rc1.0.20230804185319-08b3613c5311 h1:eESFjnjHgP4Mr/1gIwxFz5zkPbqY4GW2ihk90yGCC3o= +github.com/longhorn/longhorn-instance-manager v1.4.0-rc1.0.20230804185319-08b3613c5311/go.mod h1:Vu49XgbNHRJBMI6YCgbUkg4WN8epCr+pB5rTpqLKpdg= +github.com/longhorn/longhorn-share-manager v1.5.1 h1:TkUt0PCgbLjFN/H4OlIlKQhEaXe4dV/FeLFE4oAZe7M= +github.com/longhorn/longhorn-share-manager v1.5.1/go.mod h1:Kq3D8tu8J1SED7XiVM6Yco6qkizxCjVhYzR78bqhUUI= +github.com/longhorn/longhorn-spdk-engine v0.0.0-20230802040621-1fda4c2a0100 h1:2pY5WHq0n7oZvIqeNftp2kxR/KeRmgx6AeSvT1C7pk0= +github.com/longhorn/longhorn-spdk-engine v0.0.0-20230802040621-1fda4c2a0100/go.mod h1:f8Je075pqXDysiTFaiJ/bapeQoNDsL5KOUixQg7y5tg= github.com/longhorn/nsfilelock v0.0.0-20200723175406-fa7c83ad0003/go.mod h1:0CLeXlf59Lg6C0kjLSDf47ft73Dh37CwymYRKWwAn04= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= 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..742be5395c 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 } @@ -676,7 +682,7 @@ func (c *ReplicaClient) ReplicaRebuildStatus() (*ptypes.ReplicaRebuildStatusResp return status, nil } -func (c *ReplicaClient) CloneSnapshot(fromAddress, snapshotFileName string, exportBackingImageIfExist bool, fileSyncHTTPClientTimeout int) error { +func (c *ReplicaClient) CloneSnapshot(fromAddress, fromVolumeName, snapshotFileName string, exportBackingImageIfExist bool, fileSyncHTTPClientTimeout int) error { syncAgentServiceClient, err := c.getSyncServiceClient() if err != nil { return err @@ -690,6 +696,7 @@ func (c *ReplicaClient) CloneSnapshot(fromAddress, snapshotFileName string, expo SnapshotFileName: snapshotFileName, ExportBackingImageIfExist: exportBackingImageIfExist, FileSyncHttpClientTimeout: int32(fileSyncHTTPClientTimeout), + FromVolumeName: fromVolumeName, }); err != nil { return errors.Wrapf(err, "failed to clone snapshot %v from replica %v to host %v", snapshotFileName, fromAddress, c.host) } 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-engine/proto/ptypes/syncagent.pb.go b/vendor/github.com/longhorn/longhorn-engine/proto/ptypes/syncagent.pb.go index 9f7a93f0fd..019252852d 100644 --- a/vendor/github.com/longhorn/longhorn-engine/proto/ptypes/syncagent.pb.go +++ b/vendor/github.com/longhorn/longhorn-engine/proto/ptypes/syncagent.pb.go @@ -337,6 +337,7 @@ type SnapshotCloneRequest struct { SnapshotFileName string `protobuf:"bytes,3,opt,name=snapshot_file_name,json=snapshotFileName,proto3" json:"snapshot_file_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"` + FromVolumeName string `protobuf:"bytes,6,opt,name=from_volume_name,json=fromVolumeName,proto3" json:"from_volume_name,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -402,6 +403,13 @@ func (m *SnapshotCloneRequest) GetFileSyncHttpClientTimeout() int32 { return 0 } +func (m *SnapshotCloneRequest) GetFromVolumeName() string { + if m != nil { + return m.FromVolumeName + } + return "" +} + type VolumeExportRequest struct { SnapshotFileName string `protobuf:"bytes,1,opt,name=snapshot_file_name,json=snapshotFileName,proto3" json:"snapshot_file_name,omitempty"` Host string `protobuf:"bytes,2,opt,name=host,proto3" json:"host,omitempty"` @@ -1498,111 +1506,112 @@ func init() { func init() { proto.RegisterFile("syncagent.proto", fileDescriptor_68e10ca3dfff6283) } var fileDescriptor_68e10ca3dfff6283 = []byte{ - // 1655 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0xef, 0x6e, 0x13, 0xc7, - 0x16, 0x8f, 0x13, 0xc7, 0xd8, 0x27, 0x76, 0x12, 0x26, 0xc6, 0x38, 0x4e, 0x72, 0x6f, 0xb2, 0xc0, - 0x15, 0x57, 0x17, 0x02, 0xe2, 0xde, 0x0f, 0xe4, 0xaa, 0xa8, 0x80, 0x1b, 0x48, 0x44, 0x5a, 0xc1, - 0x06, 0x50, 0xab, 0xaa, 0x5a, 0x6d, 0xd6, 0x13, 0x7b, 0x94, 0xdd, 0x9d, 0xed, 0xce, 0x38, 0xe0, - 0xef, 0xbc, 0x40, 0xd5, 0x3e, 0x41, 0x3f, 0xf4, 0x21, 0x2a, 0xb5, 0x9f, 0xfa, 0x16, 0x7d, 0x88, - 0x4a, 0x7d, 0x82, 0x6a, 0x66, 0x76, 0xd6, 0xb3, 0xf6, 0xda, 0x09, 0x14, 0xd4, 0x7e, 0xdb, 0x39, - 0x73, 0xce, 0x6f, 0xce, 0xdf, 0x39, 0x67, 0x16, 0x96, 0xd8, 0x20, 0xf4, 0xdc, 0x2e, 0x0e, 0xf9, - 0x76, 0x14, 0x53, 0x4e, 0x51, 0x29, 0xe2, 0x83, 0x08, 0xb3, 0xd6, 0x5a, 0x97, 0xd2, 0xae, 0x8f, - 0x6f, 0x49, 0xea, 0x51, 0xff, 0xf8, 0x16, 0x0e, 0x22, 0x3e, 0x50, 0x4c, 0xad, 0xaa, 0x47, 0x83, - 0x80, 0x86, 0x6a, 0x65, 0xdd, 0x86, 0x8b, 0x8f, 0x88, 0x8f, 0x6d, 0x1c, 0xd0, 0x53, 0x6c, 0xe3, - 0xaf, 0xfb, 0x98, 0x71, 0xb4, 0x06, 0x95, 0x63, 0xe2, 0x63, 0x27, 0x74, 0x03, 0xdc, 0x2c, 0x6c, - 0x16, 0xae, 0x57, 0xec, 0xb2, 0x20, 0x7c, 0xe6, 0x06, 0xd8, 0xfa, 0x52, 0x4b, 0x88, 0x5d, 0x2d, - 0x61, 0x41, 0x8d, 0xfa, 0x1d, 0x67, 0x54, 0x6a, 0x81, 0xfa, 0x9d, 0x47, 0x89, 0xa0, 0xe0, 0x09, - 0xf1, 0x2b, 0x83, 0x67, 0x56, 0xf1, 0x84, 0xf8, 0x95, 0xe6, 0xb1, 0x76, 0xe0, 0x92, 0x8d, 0x3d, - 0x4c, 0x4e, 0x71, 0x7c, 0xe0, 0xf6, 0x43, 0xaf, 0xa7, 0x0f, 0xd8, 0x84, 0x2a, 0xa7, 0x63, 0xf8, - 0xc0, 0x69, 0x2a, 0x7a, 0x03, 0x1a, 0xa3, 0xa2, 0x2c, 0xa2, 0x21, 0xc3, 0x08, 0x41, 0x31, 0xa2, - 0x31, 0x97, 0x32, 0xf3, 0xb6, 0xfc, 0xb6, 0x7e, 0x2e, 0xc0, 0x92, 0x10, 0x3d, 0xc4, 0x61, 0x47, - 0x9f, 0x71, 0x15, 0x16, 0x8f, 0x63, 0x1a, 0x8c, 0x9d, 0x52, 0x15, 0xd4, 0xd4, 0x0c, 0x04, 0xc5, - 0x1e, 0x65, 0x3c, 0xd1, 0x5e, 0x7e, 0xa7, 0x27, 0xcc, 0x0d, 0x4f, 0x90, 0x4e, 0x74, 0x19, 0x77, - 0x44, 0x90, 0x9a, 0xc5, 0xcd, 0xc2, 0xf5, 0xb2, 0x5d, 0x16, 0x84, 0xc3, 0x41, 0xe8, 0xa1, 0xfb, - 0xb0, 0x21, 0x4f, 0x11, 0x9b, 0x4e, 0x8f, 0xf3, 0xc8, 0xf1, 0x7c, 0x82, 0x43, 0xee, 0x70, 0x12, - 0x60, 0xda, 0xe7, 0xcd, 0x79, 0x89, 0xb4, 0x2a, 0x98, 0x84, 0xc0, 0x1e, 0xe7, 0x51, 0x5b, 0x72, - 0x3c, 0x57, 0x0c, 0xd6, 0xef, 0x05, 0x58, 0x16, 0x3a, 0x31, 0xb1, 0xad, 0x2d, 0xd8, 0x02, 0xa9, - 0xab, 0xe3, 0x76, 0x3a, 0x31, 0x66, 0x4c, 0x47, 0x41, 0xd0, 0x1e, 0x28, 0x12, 0xba, 0x0c, 0x17, - 0x38, 0x75, 0x0c, 0x0b, 0x4a, 0x9c, 0xee, 0x09, 0x1b, 0xda, 0xb0, 0x22, 0xb5, 0x91, 0x7a, 0x91, - 0xf0, 0x98, 0x3a, 0x3e, 0x61, 0xc2, 0xa4, 0xb9, 0xeb, 0x0b, 0x77, 0xea, 0xdb, 0x2a, 0xb5, 0xb6, - 0xc5, 0x69, 0xe2, 0xd8, 0xfd, 0xf0, 0x98, 0xda, 0xcb, 0xcc, 0x58, 0x1d, 0x10, 0xf6, 0xc1, 0x8d, - 0x7e, 0x33, 0x0b, 0xf5, 0xc3, 0xd0, 0x8d, 0x58, 0x8f, 0xf2, 0xb6, 0x4f, 0x43, 0xfc, 0x3e, 0x0c, - 0xbf, 0x01, 0x88, 0x25, 0x98, 0x46, 0xe8, 0xe7, 0x24, 0xcf, 0xb2, 0xde, 0x49, 0xc3, 0x7f, 0x1f, - 0x36, 0xf0, 0x6b, 0x11, 0x60, 0xe7, 0xc8, 0xf5, 0x4e, 0x48, 0xd8, 0x75, 0x48, 0xe0, 0x76, 0xb1, - 0x43, 0x8e, 0x1d, 0xfc, 0x5a, 0x38, 0x4c, 0x59, 0xbd, 0xaa, 0x98, 0x1e, 0x2a, 0x9e, 0x7d, 0xc1, - 0xb2, 0x7f, 0xbc, 0x2b, 0x18, 0xde, 0x83, 0x1b, 0x7e, 0x2b, 0xc0, 0xca, 0x4b, 0xea, 0xf7, 0x03, - 0xbc, 0x2b, 0x4f, 0xd1, 0x5e, 0xc8, 0xb7, 0xa4, 0x30, 0xc1, 0x92, 0xf3, 0x26, 0xf2, 0xdf, 0xc1, - 0xe2, 0x1f, 0x8b, 0xb0, 0x22, 0x90, 0xfb, 0x51, 0x3b, 0xc6, 0x2e, 0xc7, 0xef, 0x66, 0xf1, 0x15, - 0xa8, 0x1d, 0x49, 0x10, 0x87, 0xbb, 0x71, 0x17, 0x6b, 0xd3, 0xab, 0x8a, 0xf8, 0x5c, 0xd2, 0xd0, - 0x3f, 0x61, 0xe1, 0x54, 0xfa, 0xd6, 0xcc, 0x03, 0x50, 0x24, 0x89, 0xd2, 0x80, 0x92, 0xef, 0x1e, - 0x61, 0x9f, 0x35, 0x8b, 0x9b, 0x73, 0x22, 0x8f, 0xd4, 0x0a, 0x3d, 0x01, 0xf0, 0x62, 0xdc, 0xc1, - 0x21, 0x27, 0xae, 0xdf, 0x9c, 0x97, 0x75, 0xf3, 0x1f, 0x5d, 0x37, 0x39, 0xca, 0x6f, 0xb7, 0x53, - 0xee, 0xdd, 0x90, 0xc7, 0x03, 0xdb, 0x10, 0x17, 0x86, 0x65, 0xbd, 0x2d, 0x95, 0x29, 0x29, 0xc3, - 0x8e, 0x0c, 0x1f, 0x4b, 0x95, 0xfe, 0x07, 0x8d, 0x2c, 0xb7, 0xd7, 0xc3, 0xde, 0x09, 0xeb, 0x07, - 0xcd, 0x0b, 0x52, 0xa2, 0x6e, 0x4a, 0xb4, 0x93, 0x3d, 0x61, 0x69, 0xe2, 0x0e, 0x09, 0x5e, 0x56, - 0x96, 0x2a, 0x92, 0x84, 0xbd, 0x09, 0xc8, 0xa3, 0x41, 0x24, 0xca, 0x87, 0xd0, 0xd0, 0x09, 0x30, - 0xef, 0xd1, 0x4e, 0xb3, 0x22, 0xf9, 0x2e, 0x1a, 0x3b, 0x9f, 0xca, 0x0d, 0xf4, 0x6f, 0x58, 0xf6, - 0x68, 0xe8, 0xf5, 0xe3, 0x58, 0xc4, 0xd6, 0x27, 0x01, 0xe1, 0x4d, 0x90, 0x91, 0x5d, 0x1a, 0xd2, - 0x0f, 0x04, 0x59, 0xc6, 0x8d, 0xd3, 0x58, 0xaa, 0xea, 0xbb, 0x8c, 0x29, 0x0d, 0x16, 0x92, 0xb8, - 0xa9, 0x9d, 0xb6, 0xd8, 0x10, 0x7a, 0xb4, 0xee, 0xc1, 0xd2, 0x88, 0xaf, 0xd0, 0x32, 0xcc, 0x9d, - 0xe0, 0x41, 0x12, 0x69, 0xf1, 0x89, 0xea, 0x30, 0x7f, 0xea, 0xfa, 0x7d, 0xdd, 0x56, 0xd4, 0xe2, - 0xff, 0xb3, 0x77, 0x0b, 0xd6, 0x0b, 0xa8, 0x67, 0xdd, 0x9f, 0xf4, 0x85, 0x06, 0x94, 0x94, 0xb1, - 0x09, 0x4c, 0xb2, 0x42, 0xd7, 0x60, 0x91, 0x30, 0x87, 0x84, 0x5e, 0x8c, 0x03, 0x1c, 0x72, 0xd7, - 0x97, 0x90, 0x65, 0xbb, 0x46, 0xd8, 0xfe, 0x90, 0x68, 0xdd, 0xd4, 0x29, 0x99, 0x6d, 0x9e, 0x13, - 0x50, 0x87, 0xec, 0x87, 0xdc, 0xe5, 0x7d, 0x76, 0x16, 0xfb, 0xf7, 0x05, 0xad, 0xb5, 0xe6, 0x4f, - 0xb4, 0x6e, 0x41, 0x39, 0x8a, 0x69, 0x37, 0xbd, 0xe6, 0xe6, 0xed, 0x74, 0x8d, 0x36, 0x20, 0x09, - 0x9f, 0xd3, 0x8f, 0xfd, 0xc4, 0x11, 0x15, 0x45, 0x79, 0x11, 0xfb, 0xc2, 0x45, 0x38, 0x8e, 0x69, - 0x9c, 0x24, 0xb5, 0x5a, 0x88, 0xaa, 0x48, 0x6b, 0x48, 0x86, 0xa1, 0xa8, 0xaa, 0x42, 0x13, 0x65, - 0x2a, 0xd4, 0x61, 0x9e, 0x71, 0x97, 0x63, 0x59, 0xaa, 0x15, 0x5b, 0x2d, 0xac, 0xef, 0x66, 0xb5, - 0x92, 0x36, 0x16, 0x51, 0x3b, 0xcb, 0x09, 0x99, 0x7a, 0xed, 0x10, 0x76, 0x62, 0x0e, 0x02, 0x69, - 0xbd, 0x7e, 0x42, 0xd8, 0x89, 0x3c, 0xf4, 0x20, 0x53, 0x51, 0xaa, 0x13, 0xdd, 0xc8, 0x56, 0x54, - 0xf6, 0xdc, 0xa9, 0x25, 0x95, 0x97, 0x9e, 0xc5, 0xdc, 0xf4, 0xfc, 0xb3, 0x09, 0xf7, 0xcd, 0x1c, - 0x6c, 0x65, 0xd4, 0x33, 0xd2, 0xc6, 0x1f, 0x9c, 0xe5, 0xa3, 0x7f, 0xc1, 0x52, 0x07, 0xfb, 0xdc, - 0x1d, 0x9b, 0x94, 0x6a, 0x92, 0x9c, 0xde, 0x66, 0x3b, 0xb0, 0xea, 0x8b, 0x5e, 0x1b, 0xab, 0x33, - 0x3a, 0x8e, 0x59, 0xcc, 0x2a, 0xc2, 0x0d, 0xc1, 0x90, 0xe8, 0xd0, 0x79, 0x38, 0x2c, 0xec, 0xfc, - 0x30, 0x14, 0x27, 0x84, 0xe1, 0x8b, 0x9c, 0x8b, 0x6d, 0x27, 0x37, 0x0c, 0x79, 0x76, 0xbe, 0x75, - 0x4c, 0x4a, 0x1f, 0x24, 0x26, 0x3f, 0xcc, 0x8a, 0xd1, 0x52, 0x6a, 0x39, 0x52, 0x50, 0x5b, 0x50, - 0x25, 0x2c, 0xf1, 0x22, 0x09, 0xbb, 0x12, 0xae, 0x6c, 0x2f, 0x10, 0x66, 0x6b, 0x92, 0x28, 0x91, - 0x8c, 0xab, 0x75, 0xe3, 0x30, 0xdd, 0x9b, 0x29, 0xcc, 0xb9, 0x91, 0xc2, 0x4c, 0x2b, 0xaf, 0x68, - 0x56, 0xde, 0x55, 0x58, 0xec, 0x60, 0x66, 0x76, 0x2e, 0x55, 0x5d, 0x55, 0x41, 0x4d, 0xe3, 0x9c, - 0x96, 0x5e, 0xc9, 0x28, 0xbd, 0x91, 0x52, 0xbf, 0x30, 0x5a, 0xea, 0x77, 0xa1, 0xa9, 0xbd, 0x9a, - 0x5a, 0x96, 0x24, 0x48, 0x72, 0xd1, 0x37, 0x92, 0xfd, 0xd4, 0x4a, 0x15, 0x49, 0xeb, 0x4d, 0x01, - 0xd6, 0xf4, 0x8c, 0xf5, 0xb4, 0x1f, 0x77, 0x47, 0xdd, 0xb5, 0x01, 0x40, 0x98, 0x13, 0xf5, 0xe3, - 0xee, 0xd0, 0x59, 0x15, 0xc2, 0x9e, 0x2a, 0xc2, 0xd0, 0xd2, 0x59, 0xd3, 0xd2, 0x33, 0x7c, 0xa3, - 0xec, 0x2b, 0x9a, 0x57, 0xcb, 0x4f, 0x05, 0x58, 0xb7, 0x71, 0xe4, 0x13, 0xcf, 0xb5, 0xf1, 0x51, - 0x9f, 0xf8, 0x9d, 0x11, 0x3d, 0xae, 0x40, 0x4d, 0x86, 0x4d, 0xee, 0x0d, 0x55, 0xa9, 0x8a, 0xb8, - 0x69, 0xda, 0xfb, 0xd2, 0x06, 0xdd, 0x86, 0xba, 0x9c, 0x2f, 0x63, 0xa5, 0x51, 0x3a, 0x67, 0xaa, - 0x78, 0x21, 0xb1, 0x97, 0x28, 0x9b, 0x8c, 0x9b, 0xd6, 0xaf, 0x86, 0x1b, 0xe5, 0xa8, 0x9a, 0xeb, - 0x46, 0xcf, 0xa7, 0x61, 0xc6, 0x8d, 0x6d, 0x45, 0xf8, 0xeb, 0x14, 0x1f, 0x6f, 0x07, 0xa5, 0xf1, - 0x76, 0x60, 0xd9, 0xb0, 0xa2, 0x8d, 0xdb, 0x73, 0x59, 0xfa, 0x4a, 0x1b, 0x93, 0x2d, 0xe4, 0xb4, - 0x92, 0x06, 0x94, 0x62, 0xdc, 0x73, 0x59, 0x2f, 0x69, 0xab, 0xc9, 0xca, 0xba, 0x0f, 0xab, 0x26, - 0x66, 0xb6, 0x4d, 0x9e, 0x07, 0xd9, 0xfa, 0xb6, 0x00, 0xad, 0x3c, 0x88, 0xc4, 0xe5, 0xa9, 0x87, - 0x0a, 0xa6, 0x87, 0x5a, 0x50, 0x4e, 0xa7, 0x25, 0xe5, 0xec, 0x74, 0x3d, 0xa1, 0x61, 0xde, 0x04, - 0xc4, 0x88, 0x8f, 0x43, 0xee, 0x0f, 0x1c, 0x8f, 0xc6, 0x71, 0x3f, 0xe2, 0xb8, 0x93, 0x4c, 0xc1, - 0x17, 0xf5, 0x4e, 0x5b, 0x6f, 0x8c, 0xda, 0xd5, 0x76, 0x43, 0x0f, 0xfb, 0x6f, 0x65, 0xd7, 0x47, - 0xb0, 0x61, 0x22, 0x1c, 0x50, 0xef, 0x44, 0x98, 0x36, 0x9c, 0x64, 0xd6, 0xa0, 0x42, 0x98, 0xe3, - 0x53, 0xef, 0x04, 0x77, 0x92, 0x5c, 0x2a, 0x13, 0x76, 0x20, 0xd7, 0x77, 0x7e, 0xa9, 0xc2, 0xb2, - 0x98, 0xaa, 0x1f, 0x74, 0x71, 0xc8, 0x0f, 0x71, 0x7c, 0x4a, 0x3c, 0x8c, 0x1e, 0x00, 0x0c, 0xdf, - 0xfd, 0x68, 0x55, 0xdf, 0xe6, 0x63, 0xff, 0x02, 0x5a, 0x8d, 0x6d, 0xf5, 0x33, 0x61, 0x5b, 0xff, - 0x4c, 0xd8, 0xde, 0x0d, 0x22, 0x3e, 0xb0, 0x66, 0x86, 0x10, 0x42, 0xef, 0x51, 0x08, 0xe3, 0xe7, - 0xc0, 0x14, 0x88, 0x7b, 0x50, 0xd6, 0x8f, 0x70, 0x74, 0xd9, 0x04, 0x30, 0x9e, 0xe5, 0x53, 0xc4, - 0x3f, 0x86, 0x4a, 0xfa, 0x04, 0x46, 0x4d, 0x53, 0xde, 0x7c, 0x15, 0x4f, 0x01, 0x78, 0x0c, 0xb5, - 0x4c, 0x8d, 0xa2, 0xf5, 0xf4, 0x9d, 0x9b, 0xf3, 0xca, 0x9c, 0x02, 0xb4, 0x0b, 0x55, 0xf3, 0x41, - 0x86, 0xd6, 0x34, 0x4e, 0xce, 0x33, 0x6d, 0x0a, 0xcc, 0x33, 0x58, 0xcc, 0xfe, 0xc3, 0x40, 0x1b, - 0x1a, 0x28, 0xf7, 0xb7, 0x48, 0xeb, 0x1f, 0x93, 0xb6, 0x55, 0x62, 0x58, 0x33, 0xe8, 0x09, 0x54, - 0xcd, 0xe1, 0x77, 0xa8, 0x59, 0xce, 0x8b, 0xa4, 0xb5, 0x9e, 0xbf, 0x99, 0x82, 0xed, 0x6a, 0xb0, - 0x24, 0x6f, 0xd6, 0x46, 0xa7, 0x80, 0xf3, 0x65, 0xce, 0x63, 0xa8, 0x65, 0xc6, 0x06, 0xb4, 0x3e, - 0x6d, 0xa8, 0x9b, 0x02, 0x94, 0x1a, 0xa7, 0x2a, 0x7d, 0x54, 0x9f, 0xcc, 0x15, 0x32, 0x6a, 0x5c, - 0xf6, 0x72, 0xb0, 0x66, 0xd0, 0x0e, 0xcc, 0xdb, 0x98, 0x61, 0x8e, 0x26, 0x9c, 0x37, 0x45, 0x8f, - 0x3d, 0xa8, 0x65, 0x66, 0x8b, 0x89, 0x10, 0x46, 0x38, 0x73, 0x46, 0x11, 0x59, 0x54, 0xb5, 0x4c, - 0xf3, 0x7d, 0x07, 0x65, 0x9e, 0x0f, 0xef, 0x66, 0xa3, 0x7f, 0x4f, 0x04, 0xba, 0x32, 0x9a, 0xf2, - 0x39, 0x4d, 0xdf, 0x9a, 0x41, 0x2f, 0xa1, 0x9e, 0xd7, 0x8e, 0x27, 0xc2, 0x5e, 0x1d, 0x5a, 0x3a, - 0xb9, 0x89, 0x67, 0xb5, 0x35, 0xda, 0xe4, 0xf9, 0xb5, 0xcd, 0xe9, 0xad, 0x2a, 0x51, 0xcd, 0x1b, - 0x73, 0x98, 0x18, 0x39, 0x5d, 0x6b, 0x8a, 0x2b, 0xbf, 0x02, 0x34, 0xde, 0x4f, 0xd0, 0x56, 0x1e, - 0x58, 0x36, 0xd7, 0xac, 0x69, 0x2c, 0xa9, 0x96, 0xcf, 0xb2, 0xf0, 0xaa, 0x33, 0xe4, 0xc3, 0x67, - 0xba, 0xc6, 0x14, 0x8d, 0x3f, 0x87, 0x4b, 0xb9, 0xad, 0x62, 0xa2, 0x43, 0xaf, 0xe5, 0x9d, 0x36, - 0xd6, 0x61, 0xac, 0x99, 0xa3, 0x92, 0x14, 0xfc, 0xef, 0x1f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x71, - 0x0f, 0xe5, 0x4c, 0x76, 0x16, 0x00, 0x00, + // 1674 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0xdd, 0x6e, 0xdb, 0xc8, + 0x15, 0xb6, 0x6c, 0x59, 0x91, 0x8e, 0x25, 0x5b, 0x19, 0x2b, 0x8a, 0x2c, 0xdb, 0xad, 0xcd, 0x24, + 0x85, 0x8b, 0x26, 0x4e, 0x90, 0xf6, 0x22, 0x2e, 0x1a, 0x34, 0x89, 0xea, 0xc4, 0x46, 0xdc, 0x22, + 0xa1, 0x93, 0xa0, 0x45, 0x51, 0x10, 0x34, 0x35, 0x96, 0x06, 0x26, 0x39, 0x2c, 0x67, 0xe4, 0x44, + 0xf7, 0x7d, 0x81, 0xa2, 0x7d, 0x82, 0xbd, 0xd8, 0xcb, 0x7d, 0x80, 0x05, 0x76, 0xaf, 0xf6, 0x2d, + 0xf6, 0x21, 0x16, 0xd8, 0x27, 0x58, 0xcc, 0x0c, 0x87, 0x1a, 0x4a, 0x94, 0xec, 0xfc, 0x61, 0xf7, + 0x8e, 0x73, 0xe6, 0x9c, 0x33, 0xdf, 0xf9, 0x9b, 0x73, 0x86, 0xb0, 0xc2, 0x86, 0xa1, 0xe7, 0xf6, + 0x70, 0xc8, 0x77, 0xa3, 0x98, 0x72, 0x8a, 0x4a, 0x11, 0x1f, 0x46, 0x98, 0xb5, 0xd7, 0x7b, 0x94, + 0xf6, 0x7c, 0x7c, 0x57, 0x52, 0x4f, 0x06, 0xa7, 0x77, 0x71, 0x10, 0xf1, 0xa1, 0x62, 0x6a, 0x57, + 0x3d, 0x1a, 0x04, 0x34, 0x54, 0x2b, 0xeb, 0x1e, 0x5c, 0x7d, 0x4a, 0x7c, 0x6c, 0xe3, 0x80, 0x9e, + 0x63, 0x1b, 0xff, 0x7b, 0x80, 0x19, 0x47, 0xeb, 0x50, 0x39, 0x25, 0x3e, 0x76, 0x42, 0x37, 0xc0, + 0xad, 0xc2, 0x56, 0x61, 0xa7, 0x62, 0x97, 0x05, 0xe1, 0x6f, 0x6e, 0x80, 0xad, 0x7f, 0x6a, 0x09, + 0xb1, 0xab, 0x25, 0x2c, 0xa8, 0x51, 0xbf, 0xeb, 0x8c, 0x4b, 0x2d, 0x51, 0xbf, 0xfb, 0x34, 0x11, + 0x14, 0x3c, 0x21, 0x7e, 0x6b, 0xf0, 0xcc, 0x2b, 0x9e, 0x10, 0xbf, 0xd5, 0x3c, 0xd6, 0x1e, 0x5c, + 0xb3, 0xb1, 0x87, 0xc9, 0x39, 0x8e, 0x8f, 0xdc, 0x41, 0xe8, 0xf5, 0xf5, 0x01, 0x5b, 0x50, 0xe5, + 0x74, 0x42, 0x3f, 0x70, 0x9a, 0x8a, 0xde, 0x86, 0xe6, 0xb8, 0x28, 0x8b, 0x68, 0xc8, 0x30, 0x42, + 0x50, 0x8c, 0x68, 0xcc, 0xa5, 0xcc, 0xa2, 0x2d, 0xbf, 0xad, 0x6f, 0x0b, 0xb0, 0x22, 0x44, 0x8f, + 0x71, 0xd8, 0xd5, 0x67, 0xdc, 0x84, 0xe5, 0xd3, 0x98, 0x06, 0x13, 0xa7, 0x54, 0x05, 0x35, 0x35, + 0x03, 0x41, 0xb1, 0x4f, 0x19, 0x4f, 0xd0, 0xcb, 0xef, 0xf4, 0x84, 0x85, 0xd1, 0x09, 0xd2, 0x89, + 0x2e, 0xe3, 0x8e, 0x08, 0x52, 0xab, 0xb8, 0x55, 0xd8, 0x29, 0xdb, 0x65, 0x41, 0x38, 0x1e, 0x86, + 0x1e, 0x7a, 0x04, 0x9b, 0xf2, 0x14, 0xb1, 0xe9, 0xf4, 0x39, 0x8f, 0x1c, 0xcf, 0x27, 0x38, 0xe4, + 0x0e, 0x27, 0x01, 0xa6, 0x03, 0xde, 0x5a, 0x94, 0x9a, 0xd6, 0x04, 0x93, 0x10, 0x38, 0xe0, 0x3c, + 0xea, 0x48, 0x8e, 0x57, 0x8a, 0xc1, 0xfa, 0xb1, 0x00, 0x75, 0x81, 0x89, 0x89, 0x6d, 0x6d, 0xc1, + 0x36, 0x48, 0xac, 0x8e, 0xdb, 0xed, 0xc6, 0x98, 0x31, 0x1d, 0x05, 0x41, 0x7b, 0xac, 0x48, 0xe8, + 0x3a, 0x5c, 0xe1, 0xd4, 0x31, 0x2c, 0x28, 0x71, 0x7a, 0x20, 0x6c, 0xe8, 0xc0, 0xaa, 0x44, 0x23, + 0x71, 0x91, 0xf0, 0x94, 0x3a, 0x3e, 0x61, 0xc2, 0xa4, 0x85, 0x9d, 0xa5, 0xfb, 0x8d, 0x5d, 0x95, + 0x5a, 0xbb, 0xe2, 0x34, 0x71, 0xec, 0x61, 0x78, 0x4a, 0xed, 0x3a, 0x33, 0x56, 0x47, 0x84, 0x7d, + 0x76, 0xa3, 0xbf, 0x9a, 0x87, 0xc6, 0x71, 0xe8, 0x46, 0xac, 0x4f, 0x79, 0xc7, 0xa7, 0x21, 0xfe, + 0x14, 0x86, 0xdf, 0x06, 0xc4, 0x12, 0x9d, 0x46, 0xe8, 0x17, 0x24, 0x4f, 0x5d, 0xef, 0xa4, 0xe1, + 0x7f, 0x04, 0x9b, 0xf8, 0x9d, 0x08, 0xb0, 0x73, 0xe2, 0x7a, 0x67, 0x24, 0xec, 0x39, 0x24, 0x70, + 0x7b, 0xd8, 0x21, 0xa7, 0x0e, 0x7e, 0x27, 0x1c, 0xa6, 0xac, 0x5e, 0x53, 0x4c, 0x4f, 0x14, 0xcf, + 0xa1, 0x60, 0x39, 0x3c, 0xdd, 0x17, 0x0c, 0x1f, 0xef, 0x06, 0xb4, 0x03, 0x75, 0x69, 0xed, 0x39, + 0xf5, 0x07, 0x41, 0x82, 0xb7, 0x24, 0xf1, 0xca, 0x04, 0x7e, 0x23, 0xc9, 0xb2, 0x28, 0x7e, 0x28, + 0xc0, 0xaa, 0x5a, 0xee, 0x4b, 0x3c, 0xda, 0x5f, 0xf9, 0x36, 0x17, 0xa6, 0xd8, 0x7c, 0xd9, 0x94, + 0xff, 0x05, 0xf8, 0xc6, 0xfa, 0xba, 0x08, 0xab, 0x42, 0xf3, 0x20, 0xea, 0xc4, 0xd8, 0xe5, 0xf8, + 0xc3, 0x2c, 0xbe, 0x01, 0xb5, 0x13, 0xa9, 0xc4, 0xe1, 0x6e, 0xdc, 0xc3, 0xda, 0xf4, 0xaa, 0x22, + 0xbe, 0x92, 0x34, 0xf4, 0x6b, 0x58, 0x32, 0x23, 0xa0, 0x32, 0x06, 0xce, 0x53, 0xef, 0xa3, 0x26, + 0x94, 0x7c, 0xf7, 0x04, 0xfb, 0xac, 0x55, 0xdc, 0x5a, 0x10, 0x19, 0xa7, 0x56, 0xe8, 0x39, 0x80, + 0x17, 0xe3, 0x2e, 0x0e, 0x39, 0x71, 0xfd, 0xd6, 0xa2, 0xac, 0xb0, 0xdf, 0xe9, 0x0a, 0xcb, 0x01, + 0xbf, 0xdb, 0x49, 0xb9, 0xf7, 0x43, 0x1e, 0x0f, 0x6d, 0x43, 0x5c, 0x18, 0x96, 0xf5, 0xb6, 0x91, + 0x0e, 0xf5, 0x13, 0xc3, 0xc7, 0x12, 0xd2, 0x1f, 0xa0, 0x99, 0xe5, 0xf6, 0xfa, 0xd8, 0x3b, 0x63, + 0x83, 0xa0, 0x75, 0x45, 0x4a, 0x34, 0x4c, 0x89, 0x4e, 0xb2, 0x27, 0x2c, 0x4d, 0xdc, 0x21, 0x95, + 0x97, 0x95, 0xa5, 0x8a, 0x24, 0xd5, 0xde, 0x01, 0xe4, 0xd1, 0x20, 0x12, 0x85, 0x46, 0x68, 0xe8, + 0x04, 0x98, 0xf7, 0x69, 0xb7, 0x55, 0x91, 0x7c, 0x57, 0x8d, 0x9d, 0xbf, 0xca, 0x0d, 0xf4, 0x5b, + 0xa8, 0x7b, 0x34, 0xf4, 0x06, 0x71, 0x2c, 0x62, 0xeb, 0x93, 0x80, 0xf0, 0x16, 0xc8, 0xc8, 0xae, + 0x8c, 0xe8, 0x47, 0x82, 0x2c, 0xe3, 0xc6, 0x69, 0x2c, 0xa1, 0xfa, 0x2e, 0x63, 0x0a, 0xc1, 0x52, + 0x12, 0x37, 0xb5, 0xd3, 0x11, 0x1b, 0x02, 0x47, 0xfb, 0x21, 0xac, 0x8c, 0xf9, 0x0a, 0xd5, 0x61, + 0xe1, 0x0c, 0x0f, 0x93, 0x48, 0x8b, 0x4f, 0xd4, 0x80, 0xc5, 0x73, 0xd7, 0x1f, 0xe8, 0x06, 0xa4, + 0x16, 0x7f, 0x9c, 0x7f, 0x50, 0xb0, 0x5e, 0x43, 0x23, 0xeb, 0xfe, 0xa4, 0x83, 0x34, 0xa1, 0xa4, + 0x8c, 0x4d, 0xd4, 0x24, 0x2b, 0x74, 0x0b, 0x96, 0x09, 0x73, 0x48, 0xe8, 0xc5, 0x38, 0xc0, 0x21, + 0x77, 0x7d, 0xa9, 0xb2, 0x6c, 0xd7, 0x08, 0x3b, 0x1c, 0x11, 0xad, 0x3b, 0x3a, 0x25, 0xb3, 0x6d, + 0x76, 0x8a, 0xd6, 0x11, 0xfb, 0x31, 0x77, 0xf9, 0x80, 0x5d, 0xc4, 0xfe, 0x45, 0x41, 0xa3, 0xd6, + 0xfc, 0x09, 0xea, 0x36, 0x94, 0xa3, 0x98, 0xf6, 0xd2, 0x0b, 0x71, 0xd1, 0x4e, 0xd7, 0x68, 0x13, + 0x92, 0xf0, 0x39, 0x83, 0xd8, 0x4f, 0x1c, 0x51, 0x51, 0x94, 0xd7, 0xb1, 0x2f, 0x5c, 0x84, 0xe3, + 0x98, 0xc6, 0x49, 0x52, 0xab, 0x85, 0xa8, 0x8a, 0xb4, 0x86, 0x64, 0x18, 0x8a, 0xaa, 0x2a, 0x34, + 0x51, 0xa6, 0x42, 0x03, 0x16, 0x19, 0x77, 0x39, 0x96, 0xa5, 0x5a, 0xb1, 0xd5, 0xc2, 0xfa, 0xff, + 0xbc, 0x06, 0x69, 0x63, 0x11, 0xb5, 0x8b, 0x9c, 0x90, 0xa9, 0xd7, 0x2e, 0x61, 0x67, 0xe6, 0xc8, + 0x90, 0xd6, 0xeb, 0x5f, 0x08, 0x3b, 0x93, 0x87, 0x1e, 0x65, 0x2a, 0x4a, 0xf5, 0xac, 0xdb, 0xd9, + 0x8a, 0xca, 0x9e, 0x3b, 0xb3, 0xa4, 0xf2, 0xd2, 0xb3, 0x98, 0x9b, 0x9e, 0x1f, 0x9b, 0x70, 0xff, + 0x5d, 0x80, 0xed, 0x0c, 0x3c, 0x23, 0x6d, 0xfc, 0xe1, 0x45, 0x3e, 0xfa, 0x0d, 0xac, 0x74, 0xb1, + 0xcf, 0xdd, 0x89, 0x99, 0xaa, 0x26, 0xc9, 0xe9, 0x6d, 0xb6, 0x07, 0x6b, 0xbe, 0xe8, 0xca, 0xb1, + 0x3a, 0xa3, 0xeb, 0x98, 0xc5, 0xac, 0x22, 0xdc, 0x14, 0x0c, 0x09, 0x86, 0xee, 0x93, 0x51, 0x61, + 0xe7, 0x87, 0xa1, 0x38, 0x25, 0x0c, 0xff, 0xc8, 0xb9, 0xd8, 0xf6, 0x72, 0xc3, 0x90, 0x67, 0xe7, + 0x7b, 0xc7, 0xa4, 0xf4, 0x59, 0x62, 0xf2, 0xe5, 0xbc, 0x18, 0x42, 0x25, 0xca, 0xb1, 0x82, 0xda, + 0x86, 0x2a, 0x61, 0x89, 0x17, 0x49, 0xd8, 0x93, 0xea, 0xca, 0xf6, 0x12, 0x61, 0xb6, 0x26, 0x89, + 0x12, 0xc9, 0xb8, 0x5a, 0x37, 0x0e, 0xd3, 0xbd, 0x99, 0xc2, 0x5c, 0x18, 0x2b, 0xcc, 0xb4, 0xf2, + 0x8a, 0x66, 0xe5, 0xdd, 0x84, 0xe5, 0x2e, 0x66, 0x66, 0xe7, 0x52, 0xd5, 0x55, 0x15, 0xd4, 0x34, + 0xce, 0x69, 0xe9, 0x95, 0x8c, 0xd2, 0x1b, 0x2b, 0xf5, 0x2b, 0xe3, 0xa5, 0xfe, 0x00, 0x5a, 0xda, + 0xab, 0xa9, 0x65, 0x49, 0x82, 0x24, 0x17, 0x7d, 0x33, 0xd9, 0x4f, 0xad, 0x54, 0x91, 0xb4, 0xfe, + 0x53, 0x80, 0x75, 0x3d, 0x8d, 0xbd, 0x18, 0xc4, 0xbd, 0x71, 0x77, 0x6d, 0x02, 0x10, 0xe6, 0x44, + 0x83, 0xb8, 0x37, 0x72, 0x56, 0x85, 0xb0, 0x17, 0x8a, 0x30, 0xb2, 0x74, 0xde, 0xb4, 0xf4, 0x02, + 0xdf, 0x28, 0xfb, 0x8a, 0xe6, 0xd5, 0xf2, 0x4d, 0x01, 0x36, 0x6c, 0x1c, 0xf9, 0xc4, 0x73, 0x6d, + 0x7c, 0x32, 0x20, 0x7e, 0x77, 0x0c, 0xc7, 0x0d, 0xa8, 0xc9, 0xb0, 0xc9, 0xbd, 0x11, 0x94, 0xaa, + 0x88, 0x9b, 0xa6, 0x7d, 0x2a, 0x34, 0xe8, 0x1e, 0x34, 0xe4, 0x6c, 0x16, 0x2b, 0x44, 0xe9, 0x44, + 0xaa, 0xe2, 0x85, 0xc4, 0x5e, 0x02, 0x36, 0x19, 0x4c, 0xad, 0xef, 0x0d, 0x37, 0xca, 0xa1, 0x36, + 0xd7, 0x8d, 0x9e, 0x4f, 0xc3, 0x8c, 0x1b, 0x3b, 0x8a, 0xf0, 0xf3, 0x01, 0x9f, 0x6c, 0x07, 0xa5, + 0xc9, 0x76, 0x60, 0xd9, 0xb0, 0xaa, 0x8d, 0x3b, 0x70, 0x59, 0xfa, 0x9e, 0x9b, 0x90, 0x2d, 0xe4, + 0xb4, 0x92, 0x26, 0x94, 0x62, 0xdc, 0x77, 0x59, 0x3f, 0x69, 0xab, 0xc9, 0xca, 0x7a, 0x04, 0x6b, + 0xa6, 0xce, 0x6c, 0x9b, 0xbc, 0x8c, 0x66, 0xeb, 0x7f, 0x05, 0x68, 0xe7, 0xa9, 0x48, 0x5c, 0x9e, + 0x7a, 0xa8, 0x60, 0x7a, 0xa8, 0x0d, 0xe5, 0x74, 0x5a, 0x52, 0xce, 0x4e, 0xd7, 0x53, 0x1a, 0xe6, + 0x1d, 0x40, 0x8c, 0xf8, 0x38, 0xe4, 0xfe, 0xd0, 0xf1, 0x68, 0x1c, 0x0f, 0x22, 0x8e, 0xbb, 0xc9, + 0x14, 0x7c, 0x55, 0xef, 0x74, 0xf4, 0xc6, 0xb8, 0x5d, 0x1d, 0x37, 0xf4, 0xb0, 0xff, 0x5e, 0x76, + 0xfd, 0x09, 0x36, 0x4d, 0x0d, 0x47, 0xd4, 0x3b, 0x13, 0xa6, 0x8d, 0x26, 0x99, 0x75, 0xa8, 0x10, + 0xe6, 0xf8, 0xd4, 0x3b, 0xc3, 0xdd, 0x24, 0x97, 0xca, 0x84, 0x1d, 0xc9, 0xf5, 0xfd, 0xef, 0xaa, + 0x50, 0x17, 0x53, 0xf5, 0xe3, 0x1e, 0x0e, 0xf9, 0x31, 0x8e, 0xcf, 0x89, 0x87, 0xd1, 0x63, 0x80, + 0xd1, 0x1f, 0x02, 0xb4, 0xa6, 0x6f, 0xf3, 0x89, 0xbf, 0x06, 0xed, 0xe6, 0xae, 0xfa, 0xed, 0xb0, + 0xab, 0x7f, 0x3b, 0xec, 0xee, 0x07, 0x11, 0x1f, 0x5a, 0x73, 0x23, 0x15, 0x02, 0xf7, 0xb8, 0x0a, + 0xe3, 0x37, 0xc2, 0x0c, 0x15, 0x0f, 0xa1, 0xac, 0x9f, 0xeb, 0xe8, 0xba, 0xa9, 0xc0, 0x78, 0xc0, + 0xcf, 0x10, 0xff, 0x33, 0x54, 0xd2, 0xc7, 0x32, 0x6a, 0x99, 0xf2, 0xe6, 0xfb, 0x79, 0x86, 0x82, + 0x67, 0x50, 0xcb, 0xd4, 0x28, 0xda, 0x48, 0x5f, 0xc4, 0x39, 0xef, 0xd1, 0x19, 0x8a, 0xf6, 0xa1, + 0x6a, 0x3e, 0xc8, 0xd0, 0xba, 0xd6, 0x93, 0xf3, 0x4c, 0x9b, 0xa1, 0xe6, 0x25, 0x2c, 0x67, 0xff, + 0x76, 0xa0, 0x4d, 0xad, 0x28, 0xf7, 0x07, 0x4a, 0xfb, 0x57, 0xd3, 0xb6, 0x55, 0x62, 0x58, 0x73, + 0xe8, 0x39, 0x54, 0xcd, 0xe1, 0x77, 0x84, 0x2c, 0xe7, 0x45, 0xd2, 0xde, 0xc8, 0xdf, 0x4c, 0x95, + 0xed, 0x6b, 0x65, 0x49, 0xde, 0xac, 0x8f, 0x4f, 0x01, 0x97, 0xcb, 0x9c, 0x67, 0x50, 0xcb, 0x8c, + 0x0d, 0x68, 0x63, 0xd6, 0x50, 0x37, 0x43, 0x51, 0x6a, 0x9c, 0xaa, 0xf4, 0x71, 0x3c, 0x99, 0x2b, + 0x64, 0xdc, 0xb8, 0xec, 0xe5, 0x60, 0xcd, 0xa1, 0x3d, 0x58, 0xb4, 0x31, 0xc3, 0x1c, 0x4d, 0x39, + 0x6f, 0x06, 0x8e, 0x03, 0xa8, 0x65, 0x66, 0x8b, 0xa9, 0x2a, 0x8c, 0x70, 0xe6, 0x8c, 0x22, 0xb2, + 0xa8, 0x6a, 0x99, 0xe6, 0xfb, 0x01, 0x60, 0x5e, 0x8d, 0xee, 0x66, 0xa3, 0x7f, 0x4f, 0x55, 0x74, + 0x63, 0x3c, 0xe5, 0x73, 0x9a, 0xbe, 0x35, 0x87, 0xde, 0x40, 0x23, 0xaf, 0x1d, 0x4f, 0x55, 0x7b, + 0x73, 0x64, 0xe9, 0xf4, 0x26, 0x9e, 0x45, 0x6b, 0xb4, 0xc9, 0xcb, 0xa3, 0xcd, 0xe9, 0xad, 0x2a, + 0x51, 0xcd, 0x1b, 0x73, 0x94, 0x18, 0x39, 0x5d, 0x6b, 0x86, 0x2b, 0xff, 0x05, 0x68, 0xb2, 0x9f, + 0xa0, 0xed, 0x3c, 0x65, 0xd9, 0x5c, 0xb3, 0x66, 0xb1, 0xa4, 0x28, 0x5f, 0x66, 0xd5, 0xab, 0xce, + 0x90, 0xaf, 0x3e, 0xd3, 0x35, 0x66, 0x20, 0xfe, 0x3b, 0x5c, 0xcb, 0x6d, 0x15, 0x53, 0x1d, 0x7a, + 0x2b, 0xef, 0xb4, 0x89, 0x0e, 0x63, 0xcd, 0x9d, 0x94, 0xa4, 0xe0, 0xef, 0x7f, 0x0a, 0x00, 0x00, + 0xff, 0xff, 0xe5, 0x48, 0x22, 0xcf, 0xa0, 0x16, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/longhorn/longhorn-engine/proto/ptypes/syncagent.proto b/vendor/github.com/longhorn/longhorn-engine/proto/ptypes/syncagent.proto index 9f9ff5e9f2..dfba391514 100644 --- a/vendor/github.com/longhorn/longhorn-engine/proto/ptypes/syncagent.proto +++ b/vendor/github.com/longhorn/longhorn-engine/proto/ptypes/syncagent.proto @@ -71,6 +71,7 @@ message SnapshotCloneRequest { string snapshot_file_name = 3; bool export_backing_image_if_exist = 4; int32 file_sync_http_client_timeout = 5; + string from_volume_name = 6; } message VolumeExportRequest { 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..51b3c3edf2 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,16 @@ 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, fromVolumeName, 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, + "fromVolumeName": fromVolumeName, + "fromEngineName": fromEngineName, } if err := validateProxyMethodParameters(input); err != nil { return errors.Wrap(err, "failed to clone snapshot") @@ -130,7 +140,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 +149,14 @@ 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, + FromVolumeName: fromVolumeName, } _, err = c.service.SnapshotClone(getContextWithGRPCLongTimeout(c.ctx), req) if err != nil { @@ -152,9 +166,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 +189,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 +210,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 +241,7 @@ func (c *ProxyClient) SnapshotRevert(backendStoreDriver, engineName, serviceAddr Address: serviceAddress, EngineName: engineName, BackendStoreDriver: rpc.BackendStoreDriver(driver), + VolumeName: volumeName, }, Name: name, } @@ -234,9 +253,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 +278,7 @@ func (c *ProxyClient) SnapshotPurge(backendStoreDriver, engineName, serviceAddre Address: serviceAddress, EngineName: engineName, BackendStoreDriver: rpc.BackendStoreDriver(driver), + VolumeName: volumeName, }, SkipIfInProgress: skipIfInProgress, } @@ -268,9 +290,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 +313,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 +333,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 +358,7 @@ func (c *ProxyClient) SnapshotRemove(backendStoreDriver, engineName, serviceAddr Address: serviceAddress, EngineName: engineName, BackendStoreDriver: rpc.BackendStoreDriver(driver), + VolumeName: volumeName, }, Names: names, } @@ -343,9 +370,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 +395,7 @@ func (c *ProxyClient) SnapshotHash(backendStoreDriver, engineName, serviceAddres Address: serviceAddress, EngineName: engineName, BackendStoreDriver: rpc.BackendStoreDriver(driver), + VolumeName: volumeName, }, SnapshotName: snapshotName, Rehash: rehash, @@ -378,9 +408,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 +433,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..bfca2cf76a 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,12 @@ 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"` + FromVolumeName string `protobuf:"bytes,7,opt,name=from_volume_name,json=fromVolumeName,proto3" json:"from_volume_name,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -702,9 +712,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 +740,20 @@ func (m *EngineSnapshotCloneRequest) GetFileSyncHttpClientTimeout() int32 { return 0 } +func (m *EngineSnapshotCloneRequest) GetFromEngineName() string { + if m != nil { + return m.FromEngineName + } + return "" +} + +func (m *EngineSnapshotCloneRequest) GetFromVolumeName() string { + if m != nil { + return m.FromVolumeName + } + 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 +1020,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 +1072,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 +1551,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 +1596,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 +1985,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, + // 2335 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x19, 0x4d, 0x73, 0x1c, 0x47, + 0xb5, 0x56, 0xab, 0x95, 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, 0x55, 0x14, 0x17, 0xaa, 0xb8, 0xf0, 0x07, 0xa0, 0xb8, 0x50, 0x50, 0x1c, + 0x38, 0x73, 0x0f, 0x45, 0xc1, 0x81, 0xbf, 0xc0, 0x1f, 0xa0, 0xfa, 0x6b, 0x76, 0x7a, 0xb6, 0x67, + 0x57, 0x0a, 0x6c, 0xe5, 0x36, 0xf3, 0xfa, 0xf5, 0xfb, 0x7e, 0xaf, 0x5f, 0xbf, 0x86, 0xbd, 0x81, + 0x4f, 0x87, 0xa3, 0xe3, 0x8e, 0x17, 0x87, 0xdd, 0x20, 0x8e, 0x06, 0xc3, 0x98, 0x44, 0xd9, 0xc7, + 0x6d, 0x3f, 0x4a, 0xa9, 0x1b, 0x79, 0xf8, 0x76, 0xe8, 0x46, 0xee, 0x00, 0x93, 0x6e, 0x72, 0x32, + 0xe8, 0xfa, 0x21, 0x49, 0xbc, 0x6e, 0x42, 0xe2, 0x57, 0x67, 0x9d, 0x84, 0xc4, 0x34, 0x46, 0x35, + 0x0e, 0x6a, 0x6f, 0x0f, 0xe2, 0x78, 0x10, 0xe0, 0x2e, 0x07, 0x1e, 0x8f, 0xfa, 0x5d, 0x1c, 0x26, + 0x54, 0xe2, 0xb4, 0x1f, 0x4e, 0x65, 0x84, 0xa3, 0x81, 0x1f, 0xc9, 0x9d, 0xdd, 0x84, 0x9e, 0x25, + 0x38, 0xed, 0x7a, 0x71, 0x44, 0x49, 0x1c, 0x04, 0x98, 0x48, 0x12, 0x0f, 0x2e, 0x4c, 0x22, 0x3d, + 0x8b, 0x3c, 0x77, 0x80, 0x23, 0x2a, 0x29, 0x3c, 0xfa, 0xb2, 0xda, 0x7a, 0x71, 0x18, 0xc6, 0x91, + 0xa0, 0x62, 0xfd, 0xb9, 0x02, 0xe8, 0x63, 0xa6, 0xfe, 0x3e, 0x67, 0x69, 0xe3, 0x1f, 0x8d, 0x70, + 0x4a, 0x51, 0x0b, 0x96, 0xdd, 0x5e, 0x8f, 0xe0, 0x34, 0x6d, 0x55, 0xae, 0x56, 0x6e, 0xae, 0xd8, + 0xea, 0x17, 0x3d, 0x83, 0xcd, 0x63, 0xd7, 0x3b, 0xc1, 0x51, 0xcf, 0x49, 0x69, 0x4c, 0xb0, 0xd3, + 0x23, 0xfe, 0x29, 0x26, 0xad, 0x85, 0xab, 0x95, 0x9b, 0xcd, 0xdd, 0xcb, 0x1d, 0xce, 0xa3, 0xf3, + 0x81, 0x40, 0x39, 0x62, 0x18, 0x8f, 0x38, 0x82, 0x8d, 0x8e, 0x27, 0x60, 0xe8, 0x2d, 0x68, 0x08, + 0x55, 0x9d, 0xc8, 0x0d, 0x71, 0xab, 0xca, 0x59, 0x81, 0x00, 0x7d, 0xdb, 0x0d, 0x31, 0x43, 0x38, + 0x8d, 0x83, 0x51, 0x28, 0x11, 0x16, 0x05, 0x82, 0x00, 0x31, 0x04, 0xeb, 0x10, 0xda, 0x42, 0xf2, + 0x97, 0x98, 0xa4, 0x7e, 0x1c, 0x71, 0x5d, 0x6c, 0x9c, 0x26, 0x71, 0x94, 0x62, 0xd4, 0x85, 0xe5, + 0x53, 0x01, 0xe7, 0x6a, 0x34, 0x76, 0xbf, 0xd6, 0x11, 0xd6, 0xec, 0x48, 0xf4, 0x8f, 0x46, 0x34, + 0x19, 0x51, 0x5b, 0x61, 0x59, 0x8f, 0xe1, 0x0d, 0x49, 0x8e, 0xb3, 0x78, 0x82, 0xa9, 0x4e, 0xf0, + 0x3a, 0x2c, 0x09, 0xe6, 0x92, 0x5e, 0x33, 0xa3, 0xc7, 0xa1, 0xb6, 0x5c, 0xb5, 0x7e, 0x5d, 0x81, + 0xcb, 0x79, 0x42, 0xfb, 0xaf, 0x12, 0x37, 0xea, 0x29, 0xeb, 0x3e, 0x83, 0x4d, 0x1e, 0x72, 0x8e, + 0x54, 0x9e, 0x08, 0xb8, 0xa4, 0xa9, 0x6c, 0x38, 0xe9, 0x16, 0x1b, 0x25, 0x93, 0xae, 0xba, 0x03, + 0x4b, 0x98, 0x53, 0xe7, 0x2e, 0x68, 0xec, 0x6e, 0xeb, 0x22, 0x69, 0x9c, 0x6d, 0x89, 0x6a, 0xfd, + 0xb1, 0x02, 0x57, 0xf3, 0xf2, 0x3d, 0x26, 0x71, 0x44, 0xb9, 0x73, 0x5c, 0x42, 0xe7, 0x22, 0xe6, + 0x01, 0x34, 0xfb, 0x92, 0x89, 0x93, 0x32, 0x2e, 0x52, 0x5c, 0x4b, 0x17, 0xd7, 0x24, 0x88, 0xbd, + 0xd6, 0xcf, 0x43, 0xad, 0xdf, 0x55, 0x60, 0x3b, 0x2f, 0xfc, 0x51, 0xe4, 0x26, 0xe9, 0x30, 0x9e, + 0x8f, 0xdc, 0x8f, 0xe1, 0x52, 0x2a, 0xe9, 0x3b, 0xd2, 0xf5, 0x42, 0xf0, 0x2b, 0xba, 0xe0, 0x05, + 0x21, 0xec, 0xa6, 0xda, 0x25, 0x96, 0xad, 0x1f, 0xc0, 0x8e, 0x49, 0x66, 0x3d, 0xbc, 0xbe, 0x05, + 0x75, 0xb5, 0x4d, 0x4a, 0xbb, 0x5d, 0xc6, 0x25, 0x09, 0xce, 0xec, 0x0c, 0xd9, 0xfa, 0x7b, 0x05, + 0xba, 0x79, 0xf2, 0x2f, 0xa2, 0xd0, 0x4d, 0x0e, 0x5d, 0x72, 0xc2, 0x36, 0xec, 0x0d, 0x5d, 0x3f, + 0xb2, 0x71, 0x18, 0x9f, 0xe2, 0xde, 0x11, 0x9e, 0x8f, 0x99, 0xbe, 0x0f, 0x97, 0x46, 0x8c, 0xa7, + 0x13, 0xba, 0xe4, 0xc4, 0x61, 0x72, 0x49, 0x33, 0x7d, 0x43, 0x57, 0xe0, 0x1c, 0x82, 0xd9, 0x6b, + 0xa3, 0x3c, 0x92, 0xf5, 0xd7, 0x0a, 0xbc, 0x25, 0x98, 0x29, 0xed, 0x9f, 0xfb, 0x69, 0xc1, 0x70, + 0x4f, 0xa0, 0xd6, 0xf3, 0xd3, 0x13, 0x56, 0xad, 0xaa, 0x9c, 0xa9, 0x10, 0x7e, 0xc6, 0xb6, 0xce, + 0x23, 0xb6, 0x67, 0x3f, 0xa2, 0xe4, 0xcc, 0x16, 0xfb, 0xdb, 0xdf, 0x05, 0x18, 0x03, 0xd1, 0x3a, + 0x54, 0x4f, 0xf0, 0x99, 0x2c, 0x81, 0xec, 0x13, 0xdd, 0x81, 0xda, 0xa9, 0x1b, 0x8c, 0xc6, 0x41, + 0x60, 0x62, 0xc4, 0x28, 0x1c, 0x44, 0xfd, 0xd8, 0x16, 0xb8, 0xf7, 0x17, 0xee, 0x56, 0xac, 0xdf, + 0x57, 0x61, 0xcb, 0x8c, 0x85, 0x10, 0x2c, 0xf2, 0xea, 0x26, 0xd8, 0xf0, 0x6f, 0xb4, 0x05, 0x4b, + 0x89, 0x4b, 0x70, 0x24, 0xd2, 0x64, 0xc5, 0x96, 0x7f, 0xe8, 0x09, 0xd4, 0xbd, 0xa1, 0x1f, 0xf4, + 0x08, 0x8e, 0x5a, 0x55, 0xae, 0xeb, 0xd7, 0xa7, 0x8a, 0xd0, 0xd9, 0x93, 0xd8, 0x42, 0xcb, 0x6c, + 0x33, 0xab, 0xf0, 0x44, 0x58, 0x9e, 0x57, 0xd5, 0xba, 0xad, 0x7e, 0xd1, 0x0e, 0xac, 0x8e, 0x52, + 0x4c, 0x1c, 0x8f, 0x60, 0x97, 0xe2, 0x5e, 0xab, 0xc6, 0x97, 0x1b, 0x0c, 0xb6, 0x27, 0x40, 0x6c, + 0xb3, 0x5a, 0x5d, 0x12, 0xc7, 0x83, 0xfc, 0x65, 0xba, 0xa4, 0xfe, 0x4f, 0x70, 0x6b, 0x59, 0xe8, + 0xc2, 0xbe, 0xd1, 0x43, 0x58, 0x0a, 0xdc, 0x63, 0x1c, 0xa4, 0xad, 0x3a, 0x97, 0xf8, 0xd6, 0x74, + 0x89, 0x9f, 0x73, 0x5c, 0x21, 0xaf, 0xdc, 0xd8, 0x7e, 0x1f, 0xd6, 0x34, 0x45, 0x0c, 0x9e, 0xd9, + 0xcc, 0x7b, 0xa6, 0x9e, 0x33, 0x7d, 0xfb, 0x1e, 0x34, 0x72, 0x34, 0x67, 0x6d, 0x5d, 0xc9, 0x7b, + 0xed, 0xa7, 0xaa, 0xd2, 0x8c, 0x13, 0xef, 0x14, 0xcf, 0xa9, 0x42, 0xaa, 0x30, 0x58, 0x18, 0x87, + 0x81, 0xf5, 0xab, 0x8a, 0x3a, 0xdf, 0xb2, 0x82, 0x31, 0x22, 0x03, 0x3c, 0x17, 0xfe, 0xb7, 0x61, + 0x23, 0x3d, 0xf1, 0x13, 0xc7, 0xef, 0x3b, 0x7e, 0xe4, 0x24, 0x24, 0x1e, 0xf0, 0xf3, 0x5f, 0x98, + 0x73, 0x9d, 0x2d, 0x1d, 0xf4, 0x0f, 0xd8, 0x01, 0xcb, 0xe1, 0xd6, 0x3f, 0x2a, 0x70, 0xdd, 0x20, + 0xda, 0x11, 0x75, 0xe9, 0x28, 0xd5, 0xb3, 0xf3, 0x3b, 0xb0, 0x94, 0x72, 0xb0, 0x4c, 0xcf, 0x7b, + 0xc6, 0x00, 0x28, 0xdb, 0xde, 0x11, 0x30, 0x19, 0x10, 0x82, 0x50, 0xfb, 0x73, 0x68, 0xe4, 0xc0, + 0x06, 0x9f, 0xde, 0xd3, 0x13, 0xf5, 0x9a, 0x2a, 0x43, 0x06, 0x6e, 0x8a, 0x51, 0xde, 0xf1, 0xbf, + 0xac, 0x16, 0x0d, 0xbf, 0x17, 0xc4, 0xd1, 0x7c, 0x0c, 0xdf, 0x81, 0x8d, 0x3e, 0x89, 0x43, 0x45, + 0x4b, 0x35, 0x5e, 0x22, 0x0e, 0x5e, 0x63, 0x4b, 0x02, 0xff, 0xa1, 0x6c, 0xc1, 0xae, 0xc1, 0x5a, + 0x76, 0x24, 0xe5, 0xfa, 0xa6, 0x55, 0x05, 0xe4, 0x9d, 0xd3, 0x03, 0xb8, 0x82, 0x5f, 0x25, 0x31, + 0xa1, 0x0e, 0xeb, 0xbb, 0xfc, 0x68, 0xe0, 0xf8, 0xa1, 0x3b, 0xc0, 0xcc, 0xbb, 0xf8, 0x95, 0x9f, + 0x52, 0x99, 0xf5, 0x97, 0x05, 0xd2, 0x07, 0x02, 0xe7, 0x80, 0xa1, 0x1c, 0xf4, 0xf7, 0x19, 0x02, + 0xa3, 0xd0, 0xf7, 0x03, 0xec, 0xb0, 0xc6, 0xd3, 0x19, 0x52, 0x9a, 0x38, 0x5e, 0xe0, 0xe3, 0x88, + 0x3a, 0xd4, 0x0f, 0x71, 0x3c, 0xa2, 0xbc, 0x30, 0xd4, 0xec, 0xcb, 0x0c, 0xe9, 0xe8, 0x2c, 0xf2, + 0x9e, 0x52, 0x9a, 0xec, 0x71, 0x8c, 0x4f, 0x04, 0x02, 0xba, 0x09, 0xeb, 0x79, 0xc5, 0xb8, 0xac, + 0xa2, 0x5e, 0x34, 0xc7, 0x5a, 0x71, 0x69, 0x15, 0x66, 0xbe, 0xd9, 0x5b, 0x1e, 0x63, 0xbe, 0x1c, + 0x37, 0x7c, 0x93, 0x61, 0xc7, 0x1d, 0xf3, 0xe5, 0xc3, 0xae, 0x6c, 0xfb, 0x7c, 0xc2, 0x2e, 0xc7, + 0xcd, 0x14, 0x76, 0x3f, 0xab, 0x4c, 0x16, 0x1c, 0x56, 0x95, 0xe7, 0x12, 0x77, 0x9b, 0x50, 0x63, + 0x86, 0x66, 0x91, 0x56, 0x65, 0x65, 0x8f, 0xff, 0x58, 0x5f, 0x2c, 0x16, 0x45, 0x60, 0xc1, 0x31, + 0x4a, 0xe6, 0x55, 0xf3, 0x70, 0x74, 0x2a, 0x0e, 0x86, 0x15, 0x9b, 0x7f, 0xb3, 0x9e, 0xff, 0x98, + 0x73, 0x74, 0x72, 0xe5, 0x10, 0x04, 0x88, 0x07, 0xcb, 0xb9, 0xe2, 0xff, 0x1a, 0xac, 0x49, 0x2a, + 0xd4, 0x25, 0x03, 0x4c, 0xe5, 0xdd, 0x61, 0x55, 0x00, 0x3f, 0xe1, 0x30, 0xf4, 0x2e, 0x20, 0x3d, + 0x3b, 0x38, 0xb9, 0x1a, 0xc7, 0x5c, 0x3f, 0xce, 0xe5, 0x04, 0x27, 0xf9, 0x4d, 0xd8, 0xd2, 0xb1, + 0xbd, 0x21, 0xf6, 0x4e, 0xd2, 0x51, 0x28, 0x83, 0x7a, 0x33, 0xbf, 0x63, 0x4f, 0xae, 0xa1, 0xc7, + 0xd9, 0xe9, 0xb7, 0xcc, 0xa3, 0xb0, 0x63, 0x8c, 0x42, 0xcd, 0xc6, 0xa6, 0x23, 0x10, 0xdd, 0x06, + 0xe4, 0xc5, 0x61, 0xc2, 0x2a, 0x80, 0x1f, 0x47, 0x4e, 0x88, 0xe9, 0x30, 0xee, 0xb5, 0x56, 0x44, + 0x91, 0xc8, 0xad, 0x1c, 0xf2, 0x05, 0x74, 0x0b, 0xd6, 0xbd, 0x38, 0xf2, 0x46, 0x84, 0xb5, 0x0d, + 0x4e, 0xe0, 0x87, 0x3e, 0x6d, 0x01, 0x4f, 0xd8, 0x4b, 0x63, 0xf8, 0x73, 0x06, 0x66, 0x56, 0x60, + 0x57, 0x39, 0xae, 0x51, 0xe0, 0xa6, 0xa9, 0xb0, 0x42, 0x43, 0x58, 0x41, 0xae, 0xec, 0xb1, 0x05, + 0x66, 0x85, 0xff, 0xe5, 0x34, 0xfd, 0x79, 0x45, 0x35, 0xc1, 0xba, 0xda, 0x7a, 0xda, 0x6e, 0xc3, + 0x8a, 0xf4, 0x9c, 0xdf, 0x93, 0x74, 0xeb, 0x02, 0x70, 0xd0, 0x13, 0x6d, 0x4b, 0x12, 0xf8, 0x9e, + 0x2b, 0xc9, 0xab, 0x5f, 0xf4, 0x0e, 0x34, 0xfd, 0xd4, 0xf1, 0x23, 0x8f, 0xe0, 0x10, 0x47, 0xd4, + 0x0d, 0x78, 0x58, 0xd4, 0xed, 0x35, 0x3f, 0x3d, 0x18, 0x03, 0xad, 0x7f, 0x96, 0xc8, 0xa0, 0x72, + 0x72, 0x0e, 0x41, 0x3e, 0x33, 0xa0, 0x6f, 0xc0, 0x25, 0xa9, 0x45, 0x56, 0xfc, 0x45, 0x48, 0x37, + 0x25, 0x58, 0x55, 0xfe, 0x1d, 0x58, 0x55, 0x88, 0xb9, 0xfb, 0x70, 0x43, 0xc2, 0x78, 0x7d, 0xfc, + 0x57, 0x05, 0x6e, 0x94, 0xeb, 0xa7, 0x5b, 0xfa, 0x0a, 0x48, 0x29, 0x9c, 0x11, 0x09, 0xa4, 0xa9, + 0xa5, 0xed, 0x5f, 0x90, 0x80, 0x39, 0x12, 0x13, 0x12, 0x13, 0xe5, 0x48, 0xfe, 0x83, 0xda, 0x50, + 0xcf, 0x7a, 0x83, 0x2a, 0x0f, 0xa8, 0xec, 0x7f, 0x32, 0x33, 0x17, 0x0d, 0x99, 0xb9, 0x09, 0x35, + 0x56, 0x4d, 0x55, 0x9e, 0x89, 0x1f, 0x93, 0x0d, 0x96, 0x4c, 0x36, 0xb0, 0xfe, 0x93, 0xb5, 0x44, + 0x2a, 0x67, 0xf8, 0x1c, 0x62, 0xae, 0xe5, 0x69, 0x21, 0x57, 0x9e, 0xd6, 0xa1, 0xca, 0xac, 0x25, + 0x1c, 0xc4, 0x3e, 0x59, 0xaf, 0xae, 0xd5, 0x18, 0xf9, 0x57, 0x1c, 0x5e, 0xd4, 0x8a, 0xc3, 0x0b, + 0x63, 0x8e, 0x2e, 0x19, 0x73, 0xd4, 0x7a, 0xa0, 0xee, 0xeb, 0x9a, 0xd2, 0xba, 0x3b, 0xdf, 0x80, + 0x15, 0xea, 0xa6, 0x27, 0xfb, 0xdc, 0x67, 0x4c, 0xdf, 0x55, 0x7b, 0x0c, 0xb0, 0xbe, 0xc8, 0x0e, + 0x4e, 0x8d, 0xc4, 0xc5, 0x0f, 0xce, 0x59, 0xdb, 0x8d, 0x07, 0xe7, 0xa7, 0xb3, 0x0e, 0xce, 0xf7, + 0xf4, 0x83, 0xf3, 0xea, 0x2c, 0x96, 0xf9, 0xba, 0xf2, 0x9b, 0x05, 0x35, 0x6d, 0x31, 0x20, 0xb2, + 0xa4, 0xf1, 0x53, 0x87, 0x70, 0x98, 0x1f, 0x0d, 0x38, 0xd3, 0xba, 0xdd, 0xf0, 0x53, 0x5b, 0x81, + 0x58, 0xdc, 0x06, 0x6e, 0x4a, 0x25, 0x12, 0xee, 0xc9, 0x88, 0x5f, 0x65, 0x40, 0x49, 0xac, 0x87, + 0xee, 0x42, 0x4b, 0xb9, 0x2a, 0x23, 0xe6, 0x88, 0x6c, 0x91, 0xd1, 0xb0, 0x25, 0xd7, 0x33, 0xc2, + 0x42, 0x1c, 0x2d, 0x65, 0x16, 0x0b, 0x29, 0x93, 0x25, 0x59, 0xad, 0x90, 0x64, 0xac, 0xad, 0xca, + 0x75, 0x4c, 0xd9, 0xff, 0x38, 0x7f, 0x96, 0xf3, 0xf9, 0xa3, 0xe7, 0x72, 0xbd, 0x90, 0xcb, 0xd6, + 0xbf, 0x17, 0xe0, 0x75, 0x15, 0xdb, 0x2a, 0x9d, 0xe6, 0x92, 0x32, 0x86, 0x3c, 0x5e, 0x30, 0xd6, + 0x32, 0x5e, 0xc9, 0xb9, 0x69, 0x65, 0xa1, 0x56, 0xbf, 0xd9, 0x1d, 0x92, 0x99, 0xaa, 0x2a, 0xef, + 0x90, 0x3b, 0xb0, 0xaa, 0x8c, 0xcf, 0xd7, 0x6a, 0x7c, 0xad, 0x21, 0x61, 0x47, 0x0c, 0x65, 0x1b, + 0x56, 0xfa, 0xcc, 0x89, 0xac, 0x5f, 0xe5, 0x46, 0xab, 0xdb, 0x75, 0x06, 0x60, 0xbd, 0xe9, 0xec, + 0x66, 0x76, 0x79, 0x56, 0x33, 0x5b, 0xac, 0xbd, 0xf5, 0xc9, 0xda, 0xfb, 0x19, 0xbc, 0xa9, 0xd9, + 0x78, 0x72, 0x4e, 0xf1, 0xfe, 0x98, 0x48, 0xe0, 0x67, 0x26, 0x6e, 0xa9, 0x2e, 0x31, 0xb7, 0x4f, + 0x4c, 0x78, 0x14, 0x79, 0x06, 0xb1, 0xfe, 0x94, 0x1d, 0x5d, 0x12, 0xef, 0x25, 0x26, 0x7e, 0xff, + 0xcc, 0xc6, 0xc7, 0x23, 0x3f, 0xf8, 0x8a, 0xbd, 0x59, 0xb4, 0x4e, 0x75, 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, + 0x21, 0x3b, 0x99, 0xb2, 0x1d, 0x73, 0xeb, 0xdd, 0xff, 0x9f, 0x8e, 0xf9, 0x4b, 0xa5, 0x10, 0xb7, + 0x87, 0x71, 0x0f, 0xbf, 0x48, 0x7a, 0x2e, 0xfd, 0x8a, 0x65, 0xbf, 0x01, 0x8b, 0x61, 0xdc, 0x13, + 0x32, 0x37, 0x77, 0x37, 0x0a, 0xfe, 0x60, 0x52, 0xda, 0x1c, 0xc1, 0xfa, 0x6d, 0x36, 0x6e, 0x57, + 0x4d, 0xcf, 0x53, 0x37, 0x1d, 0xce, 0x45, 0xf8, 0x89, 0x16, 0x67, 0xc1, 0xd0, 0xe2, 0x6c, 0xc1, + 0x12, 0xc1, 0x43, 0x37, 0x1d, 0xca, 0xd2, 0x26, 0xff, 0xac, 0x5f, 0x4c, 0x8c, 0x32, 0x99, 0x9c, + 0x73, 0x6c, 0x3d, 0xcf, 0x23, 0x2d, 0xeb, 0x0c, 0xde, 0x29, 0x93, 0x4a, 0x4f, 0xcb, 0x8f, 0x0b, + 0x69, 0x79, 0xd7, 0x78, 0x97, 0x29, 0xd9, 0x6d, 0x4c, 0xca, 0xcf, 0x66, 0x25, 0xe5, 0x5d, 0x3d, + 0x29, 0xad, 0xe2, 0x85, 0x3a, 0x6f, 0xc0, 0xc9, 0x94, 0xfc, 0x10, 0xae, 0x08, 0xd9, 0x0e, 0x31, + 0x25, 0xbe, 0x97, 0x4e, 0x3c, 0xe8, 0xdc, 0x82, 0xe5, 0x50, 0x2c, 0x49, 0x03, 0x5f, 0x52, 0x0c, + 0xe4, 0x0e, 0x5b, 0xad, 0xef, 0xfe, 0x0d, 0x69, 0x4f, 0x65, 0x47, 0x98, 0x9c, 0xfa, 0x1e, 0xb3, + 0xc9, 0x3a, 0xfb, 0xc4, 0x44, 0x3e, 0x29, 0x3d, 0xc1, 0x14, 0x95, 0x7b, 0xa9, 0xbd, 0xa3, 0x99, + 0xcc, 0xf8, 0x6a, 0xf5, 0x0c, 0x56, 0xb2, 0xe7, 0xa7, 0x69, 0xa4, 0xae, 0xe9, 0xa4, 0xcc, 0x2f, + 0x56, 0x4f, 0x61, 0x35, 0xff, 0x10, 0x84, 0xae, 0x1a, 0x36, 0x69, 0x6f, 0x44, 0xed, 0xad, 0x8e, + 0x78, 0xfb, 0xec, 0xa8, 0xb7, 0xcf, 0xce, 0x7e, 0x98, 0xd0, 0x33, 0xf4, 0x12, 0x36, 0x0c, 0x6f, + 0x34, 0xe8, 0x86, 0x81, 0xa0, 0xe9, 0x15, 0xa7, 0x94, 0xee, 0x33, 0xd8, 0x2a, 0xec, 0x1a, 0x8e, + 0x68, 0x2f, 0xfe, 0x71, 0x34, 0x4d, 0xf7, 0x32, 0x62, 0x14, 0xac, 0xd9, 0x0f, 0x0d, 0xe8, 0x3d, + 0x83, 0xcc, 0xe7, 0x78, 0x99, 0x28, 0xe5, 0xfa, 0x39, 0x34, 0xf5, 0xf7, 0x19, 0x64, 0x19, 0x38, + 0x14, 0x9e, 0x88, 0xda, 0x37, 0xa7, 0xe0, 0x14, 0x1b, 0xf2, 0xd5, 0xfc, 0x23, 0xc6, 0x34, 0xc3, + 0x5c, 0x3f, 0xdf, 0xd3, 0x07, 0x7a, 0x0e, 0x4d, 0x7d, 0xa6, 0x5d, 0x10, 0xd9, 0x38, 0xf0, 0x2e, + 0x35, 0xc0, 0x87, 0xb0, 0xa6, 0x0d, 0x56, 0xd1, 0x4e, 0xf9, 0x88, 0x77, 0x16, 0x2d, 0x07, 0x36, + 0x0c, 0x43, 0xda, 0x69, 0x3a, 0xdf, 0xbe, 0xd0, 0x3c, 0x39, 0x2f, 0x2c, 0x1f, 0xc7, 0x95, 0x08, + 0x9b, 0x1f, 0xf8, 0x9e, 0x47, 0xd8, 0xdc, 0x68, 0xef, 0xe2, 0xc2, 0x96, 0x0e, 0x31, 0x35, 0x3f, + 0xb1, 0x78, 0x2c, 0xf5, 0x53, 0xae, 0xd7, 0x28, 0x15, 0xf7, 0xe9, 0x38, 0x90, 0x58, 0xe1, 0x2c, + 0x54, 0x03, 0xc3, 0xe1, 0x59, 0x4a, 0xe9, 0x87, 0x80, 0x26, 0x4b, 0x30, 0xba, 0x3e, 0xe3, 0x40, + 0x50, 0x54, 0xdf, 0xbd, 0xc8, 0xc1, 0xc1, 0xd2, 0x4b, 0x1f, 0x66, 0x94, 0xd8, 0x40, 0x1b, 0xa2, + 0x15, 0xd2, 0x6b, 0xda, 0xc4, 0x29, 0x81, 0x4d, 0xd3, 0xb0, 0x04, 0x4d, 0xa3, 0xa0, 0xeb, 0xd3, + 0x99, 0x89, 0xa9, 0x73, 0xfc, 0x14, 0xd6, 0xb4, 0xab, 0x6a, 0x21, 0x04, 0x4d, 0x93, 0x8d, 0xf6, + 0x8d, 0x72, 0x14, 0x9d, 0xb8, 0x03, 0x1b, 0xa6, 0x7b, 0xf0, 0xb9, 0x63, 0x72, 0xe6, 0x7c, 0xe0, + 0x11, 0xc0, 0xf8, 0x16, 0x89, 0xde, 0x34, 0xf5, 0xe6, 0xe3, 0xeb, 0x65, 0x69, 0x04, 0x7d, 0x04, + 0x8d, 0xdc, 0x7d, 0x67, 0x9a, 0x78, 0xef, 0x98, 0x38, 0x4c, 0x96, 0xb4, 0x1e, 0xbc, 0xae, 0xb7, + 0xea, 0x7e, 0x34, 0x98, 0xad, 0x7b, 0xe7, 0x62, 0x57, 0x0b, 0xf4, 0x3d, 0xd8, 0x34, 0x5d, 0xbf, + 0x0a, 0xc1, 0x32, 0xe5, 0x86, 0x36, 0xad, 0x88, 0x6a, 0x17, 0x87, 0x42, 0x50, 0x98, 0x2e, 0x15, + 0xa5, 0xb4, 0x6c, 0x78, 0x6d, 0xa2, 0x99, 0x47, 0x46, 0x3b, 0x4e, 0x34, 0xfb, 0xa5, 0x34, 0x0f, + 0x01, 0xc6, 0x6d, 0xd4, 0x34, 0x93, 0xbe, 0xad, 0xf1, 0x29, 0x69, 0xbd, 0x8e, 0x97, 0x38, 0xf9, + 0x3b, 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x70, 0xc8, 0xae, 0x8e, 0xb7, 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..21c0f812b9 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,12 @@ 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; + string from_volume_name = 7; } message EngineSnapshotCloneStatusProxyResponse { @@ -162,6 +165,7 @@ message EngineSnapshotBackupStatusRequest { string backup_name = 2; string replica_address = 3; + string replica_name = 4; } message EngineSnapshotBackupStatusProxyResponse { @@ -224,6 +228,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..5827456816 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -230,17 +230,17 @@ github.com/longhorn/backupstore/util github.com/longhorn/go-iscsi-helper/iscsi github.com/longhorn/go-iscsi-helper/types github.com/longhorn/go-iscsi-helper/util -# github.com/longhorn/go-spdk-helper v0.0.0-20230626041832-c611b61f6b36 +# github.com/longhorn/go-spdk-helper v0.0.0-20230802035240-e5fe21b6067f ## 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.20230804172754-4d54af9e4ccf ## 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.20230804185319-08b3613c5311 ## explicit; go 1.20 github.com/longhorn/longhorn-instance-manager/pkg/api github.com/longhorn/longhorn-instance-manager/pkg/client @@ -248,7 +248,7 @@ github.com/longhorn/longhorn-instance-manager/pkg/imrpc github.com/longhorn/longhorn-instance-manager/pkg/meta github.com/longhorn/longhorn-instance-manager/pkg/types github.com/longhorn/longhorn-instance-manager/pkg/util -# github.com/longhorn/longhorn-share-manager v1.4.0-rc1.0.20230531125701-c996c5a415b6 +# github.com/longhorn/longhorn-share-manager v1.5.1 ## explicit; go 1.20 github.com/longhorn/longhorn-share-manager/pkg/client github.com/longhorn/longhorn-share-manager/pkg/crypto @@ -258,7 +258,7 @@ github.com/longhorn/longhorn-share-manager/pkg/server/nfs github.com/longhorn/longhorn-share-manager/pkg/types github.com/longhorn/longhorn-share-manager/pkg/util github.com/longhorn/longhorn-share-manager/pkg/volume -# github.com/longhorn/longhorn-spdk-engine v0.0.0-20230627161406-64cb30ad3cf1 +# github.com/longhorn/longhorn-spdk-engine v0.0.0-20230802040621-1fda4c2a0100 ## explicit; go 1.17 github.com/longhorn/longhorn-spdk-engine/pkg/types github.com/longhorn/longhorn-spdk-engine/proto/spdkrpc From 39fe49b0bf05c31345e10362bfd85c6776f905cb Mon Sep 17 00:00:00 2001 From: Eric Weber Date: Mon, 26 Jun 2023 15:57:05 -0500 Subject: [PATCH 2/7] Use new identity validation flags and fields Signed-off-by: Eric Weber --- controller/engine_controller.go | 3 ++- engineapi/enginesim.go | 3 ++- engineapi/instance_manager.go | 14 +++++++++++++- engineapi/proxy_backup.go | 15 +++++++++------ engineapi/proxy_metrics.go | 2 +- engineapi/proxy_replica.go | 13 ++++++++----- engineapi/proxy_snapshot.go | 33 ++++++++++++++++++++++----------- engineapi/proxy_volume.go | 14 +++++++++----- engineapi/snapshot.go | 8 +++++--- engineapi/types.go | 2 +- 10 files changed, 72 insertions(+), 35 deletions(-) diff --git a/controller/engine_controller.go b/controller/engine_controller.go index 23d0a441a6..895000b758 100644 --- a/controller/engine_controller.go +++ b/controller/engine_controller.go @@ -1565,7 +1565,8 @@ func cloneSnapshot(engine *longhorn.Engine, engineClientProxy engineapi.EngineCl } sourceEngineControllerURL := imutil.GetURL(sourceEngine.Status.StorageIP, sourceEngine.Status.Port) - if err := engineClientProxy.SnapshotClone(engine, snapshotName, sourceEngineControllerURL, fileSyncHTTPClientTimeout); err != nil { + if err := engineClientProxy.SnapshotClone(engine, snapshotName, sourceEngineControllerURL, sourceEngine.Name, + fileSyncHTTPClientTimeout); err != nil { // There is only 1 replica during volume cloning, // so if the cloning failed, it must be that the replica failed to clone. for _, status := range engine.Status.CloneStatus { diff --git a/engineapi/enginesim.go b/engineapi/enginesim.go index 33516480c1..c9e63162a8 100644 --- a/engineapi/enginesim.go +++ b/engineapi/enginesim.go @@ -216,7 +216,8 @@ func (e *EngineSimulator) BackupRestore(engine *longhorn.Engine, backupTarget, b return fmt.Errorf(ErrNotImplement) } -func (e *EngineSimulator) SnapshotClone(engine *longhorn.Engine, snapshotName, fromControllerAddress string, fileSyncHTTPClientTimeout int64) error { +func (e *EngineSimulator) SnapshotClone(engine *longhorn.Engine, snapshotName, fromEngineAddress, + fromEngineName string, fileSyncHTTPClientTimeout int64) error { return fmt.Errorf(ErrNotImplement) } diff --git a/engineapi/instance_manager.go b/engineapi/instance_manager.go index 537c2897f5..d9f6069e77 100644 --- a/engineapi/instance_manager.go +++ b/engineapi/instance_manager.go @@ -336,6 +336,10 @@ func getBinaryAndArgsForEngineProcessCreation(e *longhorn.Engine, } } + if engineCLIAPIVersion >= 9 { + args = append([]string{"--engine-instance-name", e.Name}, args...) + } + for _, addr := range e.Status.CurrentReplicaAddressMap { args = append(args, "--replica", GetBackendReplicaURL(addr)) } @@ -358,7 +362,10 @@ func getBinaryAndArgsForReplicaProcessCreation(r *longhorn.Replica, args = append(args, "--disableRevCounter") } if engineCLIAPIVersion >= 7 { - args = append(args, "--volume-name", r.Spec.VolumeName) + if engineCLIAPIVersion < 9 { + // Replaced by the global --volume-name flag when engineCLIAPIVersion == 9. + args = append(args, "--volume-name", r.Spec.VolumeName) + } if dataLocality == longhorn.DataLocalityStrictLocal { args = append(args, "--data-server-protocol", "unix") @@ -369,6 +376,11 @@ func getBinaryAndArgsForReplicaProcessCreation(r *longhorn.Replica, } } + if engineCLIAPIVersion >= 9 { + args = append(args, "--replica-instance-name", r.Name) + args = append([]string{"--volume-name", r.Spec.VolumeName}, args...) + } + // 3 ports are already used by replica server, data server and syncagent server syncAgentPortCount := portCount - 3 args = append(args, "--sync-agent-port-count", strconv.Itoa(syncAgentPortCount)) diff --git a/engineapi/proxy_backup.go b/engineapi/proxy_backup.go index 194ad3072a..b82c6f0b68 100644 --- a/engineapi/proxy_backup.go +++ b/engineapi/proxy_backup.go @@ -37,9 +37,9 @@ func (p *Proxy) SnapshotBackup(e *longhorn.Engine, snapshotName, backupName, bac return "", "", err } - backupID, replicaAddress, err := p.grpcClient.SnapshotBackup(string(e.Spec.BackendStoreDriver), e.Name, p.DirectToURL(e), - backupName, snapshotName, backupTarget, backingImageName, backingImageChecksum, - compressionMethod, concurrentLimit, storageClassName, labels, credentialEnv, + backupID, replicaAddress, err := p.grpcClient.SnapshotBackup(string(e.Spec.BackendStoreDriver), e.Name, + e.Spec.VolumeName, p.DirectToURL(e), backupName, snapshotName, backupTarget, backingImageName, + backingImageChecksum, compressionMethod, concurrentLimit, storageClassName, labels, credentialEnv, ) if err != nil { return "", "", err @@ -49,7 +49,8 @@ func (p *Proxy) SnapshotBackup(e *longhorn.Engine, snapshotName, backupName, bac } func (p *Proxy) SnapshotBackupStatus(e *longhorn.Engine, backupName, replicaAddress string) (status *longhorn.EngineBackupStatus, err error) { - recv, err := p.grpcClient.SnapshotBackupStatus(string(e.Spec.BackendStoreDriver), e.Name, p.DirectToURL(e), backupName, replicaAddress) + recv, err := p.grpcClient.SnapshotBackupStatus(string(e.Spec.BackendStoreDriver), e.Name, e.Spec.VolumeName, + p.DirectToURL(e), backupName, replicaAddress, "") if err != nil { return nil, err } @@ -67,11 +68,13 @@ func (p *Proxy) BackupRestore(e *longhorn.Engine, backupTarget, backupName, back return err } - return p.grpcClient.BackupRestore(string(e.Spec.BackendStoreDriver), e.Name, p.DirectToURL(e), backupURL, backupTarget, backupVolumeName, envs, concurrentLimit) + return p.grpcClient.BackupRestore(string(e.Spec.BackendStoreDriver), e.Name, e.Spec.VolumeName, p.DirectToURL(e), + backupURL, backupTarget, backupVolumeName, envs, concurrentLimit) } func (p *Proxy) BackupRestoreStatus(e *longhorn.Engine) (status map[string]*longhorn.RestoreStatus, err error) { - recv, err := p.grpcClient.BackupRestoreStatus(string(e.Spec.BackendStoreDriver), e.Name, p.DirectToURL(e)) + recv, err := p.grpcClient.BackupRestoreStatus(string(e.Spec.BackendStoreDriver), e.Name, e.Spec.VolumeName, + p.DirectToURL(e)) if err != nil { return nil, err } diff --git a/engineapi/proxy_metrics.go b/engineapi/proxy_metrics.go index 7fdc1f5851..56ff4b0db9 100644 --- a/engineapi/proxy_metrics.go +++ b/engineapi/proxy_metrics.go @@ -5,7 +5,7 @@ import ( ) func (p *Proxy) MetricsGet(e *longhorn.Engine) (*Metrics, error) { - metrics, err := p.grpcClient.MetricsGet(p.DirectToURL(e)) + metrics, err := p.grpcClient.MetricsGet(e.Name, e.Spec.VolumeName, p.DirectToURL(e)) if err != nil { return nil, err } diff --git a/engineapi/proxy_replica.go b/engineapi/proxy_replica.go index cd4fa4f07a..c48f7009be 100644 --- a/engineapi/proxy_replica.go +++ b/engineapi/proxy_replica.go @@ -5,7 +5,9 @@ import ( ) func (p *Proxy) ReplicaAdd(e *longhorn.Engine, replicaName, replicaAddress string, restore, fastSync bool, replicaFileSyncHTTPClientTimeout int64) (err error) { - return p.grpcClient.ReplicaAdd(string(e.Spec.BackendStoreDriver), e.Name, p.DirectToURL(e), replicaName, replicaAddress, restore, e.Spec.VolumeSize, e.Status.CurrentSize, int(replicaFileSyncHTTPClientTimeout), fastSync) + return p.grpcClient.ReplicaAdd(string(e.Spec.BackendStoreDriver), e.Name, e.Spec.VolumeName, p.DirectToURL(e), + replicaName, replicaAddress, restore, e.Spec.VolumeSize, e.Status.CurrentSize, + int(replicaFileSyncHTTPClientTimeout), fastSync) } func (p *Proxy) ReplicaRemove(e *longhorn.Engine, address string) (err error) { @@ -13,7 +15,8 @@ func (p *Proxy) ReplicaRemove(e *longhorn.Engine, address string) (err error) { } func (p *Proxy) ReplicaList(e *longhorn.Engine) (replicas map[string]*Replica, err error) { - resp, err := p.grpcClient.ReplicaList(string(e.Spec.BackendStoreDriver), e.Name, p.DirectToURL(e)) + resp, err := p.grpcClient.ReplicaList(string(e.Spec.BackendStoreDriver), e.Name, e.Spec.VolumeName, + p.DirectToURL(e)) if err != nil { return nil, err } @@ -33,7 +36,8 @@ func (p *Proxy) ReplicaList(e *longhorn.Engine) (replicas map[string]*Replica, e } func (p *Proxy) ReplicaRebuildStatus(e *longhorn.Engine) (status map[string]*longhorn.RebuildStatus, err error) { - recv, err := p.grpcClient.ReplicaRebuildingStatus(string(e.Spec.BackendStoreDriver), e.Name, p.DirectToURL(e)) + recv, err := p.grpcClient.ReplicaRebuildingStatus(string(e.Spec.BackendStoreDriver), e.Name, e.Spec.VolumeName, + p.DirectToURL(e)) if err != nil { return nil, err } @@ -49,8 +53,7 @@ func (p *Proxy) ReplicaRebuildVerify(e *longhorn.Engine, url string) (err error) if err := ValidateReplicaURL(url); err != nil { return err } - - return p.grpcClient.ReplicaVerifyRebuild(string(e.Spec.BackendStoreDriver), p.DirectToURL(e), url) + return p.grpcClient.ReplicaVerifyRebuild(string(e.Spec.BackendStoreDriver), e.Name, e.Spec.VolumeName, p.DirectToURL(e), url, "") } func (p *Proxy) ReplicaModeUpdate(e *longhorn.Engine, url, mode string) (err error) { diff --git a/engineapi/proxy_snapshot.go b/engineapi/proxy_snapshot.go index e28d742a61..4d65e09283 100644 --- a/engineapi/proxy_snapshot.go +++ b/engineapi/proxy_snapshot.go @@ -5,11 +5,13 @@ import ( ) func (p *Proxy) SnapshotCreate(e *longhorn.Engine, name string, labels map[string]string) (string, error) { - return p.grpcClient.VolumeSnapshot(string(e.Spec.BackendStoreDriver), e.Name, p.DirectToURL(e), name, labels) + return p.grpcClient.VolumeSnapshot(string(e.Spec.BackendStoreDriver), e.Name, e.Spec.VolumeName, p.DirectToURL(e), + name, labels) } func (p *Proxy) SnapshotList(e *longhorn.Engine) (snapshots map[string]*longhorn.SnapshotInfo, err error) { - recv, err := p.grpcClient.SnapshotList(string(e.Spec.BackendStoreDriver), e.Name, p.DirectToURL(e)) + recv, err := p.grpcClient.SnapshotList(string(e.Spec.BackendStoreDriver), e.Name, e.Spec.VolumeName, + p.DirectToURL(e)) if err != nil { return nil, err } @@ -30,12 +32,15 @@ func (p *Proxy) SnapshotGet(e *longhorn.Engine, name string) (snapshot *longhorn return recv[name], nil } -func (p *Proxy) SnapshotClone(e *longhorn.Engine, snapshotName, fromController string, fileSyncHTTPClientTimeout int64) (err error) { - return p.grpcClient.SnapshotClone(string(e.Spec.BackendStoreDriver), e.Name, p.DirectToURL(e), snapshotName, fromController, int(fileSyncHTTPClientTimeout)) +func (p *Proxy) SnapshotClone(e *longhorn.Engine, snapshotName, fromEngineAddress, fromEngineName string, + fileSyncHTTPClientTimeout int64) (err error) { + return p.grpcClient.SnapshotClone(string(e.Spec.BackendStoreDriver), e.Name, e.Spec.VolumeName, p.DirectToURL(e), + snapshotName, fromEngineAddress, fromEngineName, int(fileSyncHTTPClientTimeout)) } func (p *Proxy) SnapshotCloneStatus(e *longhorn.Engine) (status map[string]*longhorn.SnapshotCloneStatus, err error) { - recv, err := p.grpcClient.SnapshotCloneStatus(string(e.Spec.BackendStoreDriver), e.Name, p.DirectToURL(e)) + recv, err := p.grpcClient.SnapshotCloneStatus(string(e.Spec.BackendStoreDriver), e.Name, e.Spec.VolumeName, + p.DirectToURL(e)) if err != nil { return nil, err } @@ -48,15 +53,18 @@ func (p *Proxy) SnapshotCloneStatus(e *longhorn.Engine) (status map[string]*long } func (p *Proxy) SnapshotRevert(e *longhorn.Engine, snapshotName string) (err error) { - return p.grpcClient.SnapshotRevert(string(e.Spec.BackendStoreDriver), e.Name, p.DirectToURL(e), snapshotName) + return p.grpcClient.SnapshotRevert(string(e.Spec.BackendStoreDriver), e.Name, e.Spec.VolumeName, p.DirectToURL(e), + snapshotName) } func (p *Proxy) SnapshotPurge(e *longhorn.Engine) (err error) { - return p.grpcClient.SnapshotPurge(string(e.Spec.BackendStoreDriver), e.Name, p.DirectToURL(e), true) + return p.grpcClient.SnapshotPurge(string(e.Spec.BackendStoreDriver), e.Name, e.Spec.VolumeName, p.DirectToURL(e), + true) } func (p *Proxy) SnapshotPurgeStatus(e *longhorn.Engine) (status map[string]*longhorn.PurgeStatus, err error) { - recv, err := p.grpcClient.SnapshotPurgeStatus(string(e.Spec.BackendStoreDriver), e.Name, p.DirectToURL(e)) + recv, err := p.grpcClient.SnapshotPurgeStatus(string(e.Spec.BackendStoreDriver), e.Name, e.Spec.VolumeName, + p.DirectToURL(e)) if err != nil { return nil, err } @@ -69,15 +77,18 @@ func (p *Proxy) SnapshotPurgeStatus(e *longhorn.Engine) (status map[string]*long } func (p *Proxy) SnapshotDelete(e *longhorn.Engine, name string) (err error) { - return p.grpcClient.SnapshotRemove(string(e.Spec.BackendStoreDriver), e.Name, p.DirectToURL(e), []string{name}) + return p.grpcClient.SnapshotRemove(string(e.Spec.BackendStoreDriver), e.Name, e.Spec.VolumeName, p.DirectToURL(e), + []string{name}) } func (p *Proxy) SnapshotHash(e *longhorn.Engine, snapshotName string, rehash bool) error { - return p.grpcClient.SnapshotHash(string(e.Spec.BackendStoreDriver), e.Name, p.DirectToURL(e), snapshotName, rehash) + return p.grpcClient.SnapshotHash(string(e.Spec.BackendStoreDriver), e.Name, e.Spec.VolumeName, p.DirectToURL(e), + snapshotName, rehash) } func (p *Proxy) SnapshotHashStatus(e *longhorn.Engine, snapshotName string) (status map[string]*longhorn.HashStatus, err error) { - recv, err := p.grpcClient.SnapshotHashStatus(string(e.Spec.BackendStoreDriver), e.Name, p.DirectToURL(e), snapshotName) + recv, err := p.grpcClient.SnapshotHashStatus(string(e.Spec.BackendStoreDriver), e.Name, e.Spec.VolumeName, + p.DirectToURL(e), snapshotName) if err != nil { return nil, err } diff --git a/engineapi/proxy_volume.go b/engineapi/proxy_volume.go index a5bd1fee83..cb477effd2 100644 --- a/engineapi/proxy_volume.go +++ b/engineapi/proxy_volume.go @@ -7,7 +7,7 @@ import ( ) func (p *Proxy) VolumeGet(e *longhorn.Engine) (volume *Volume, err error) { - recv, err := p.grpcClient.VolumeGet(string(e.Spec.BackendStoreDriver), e.Name, p.DirectToURL(e)) + recv, err := p.grpcClient.VolumeGet(string(e.Spec.BackendStoreDriver), e.Name, e.Spec.VolumeName, p.DirectToURL(e)) if err != nil { return nil, err } @@ -16,7 +16,8 @@ func (p *Proxy) VolumeGet(e *longhorn.Engine) (volume *Volume, err error) { } func (p *Proxy) VolumeExpand(e *longhorn.Engine) (err error) { - return p.grpcClient.VolumeExpand(string(e.Spec.BackendStoreDriver), e.Name, p.DirectToURL(e), e.Spec.VolumeSize) + return p.grpcClient.VolumeExpand(string(e.Spec.BackendStoreDriver), e.Name, e.Spec.VolumeName, p.DirectToURL(e), + e.Spec.VolumeSize) } func (p *Proxy) VolumeFrontendStart(e *longhorn.Engine) (err error) { @@ -29,13 +30,16 @@ func (p *Proxy) VolumeFrontendStart(e *longhorn.Engine) (err error) { return fmt.Errorf("cannot start empty frontend") } - return p.grpcClient.VolumeFrontendStart(string(e.Spec.BackendStoreDriver), e.Name, p.DirectToURL(e), frontendName) + return p.grpcClient.VolumeFrontendStart(string(e.Spec.BackendStoreDriver), e.Name, e.Spec.VolumeName, + p.DirectToURL(e), frontendName) } func (p *Proxy) VolumeFrontendShutdown(e *longhorn.Engine) (err error) { - return p.grpcClient.VolumeFrontendShutdown(string(e.Spec.BackendStoreDriver), e.Name, p.DirectToURL(e)) + return p.grpcClient.VolumeFrontendShutdown(string(e.Spec.BackendStoreDriver), e.Name, e.Spec.VolumeName, + p.DirectToURL(e)) } func (p *Proxy) VolumeUnmapMarkSnapChainRemovedSet(e *longhorn.Engine) error { - return p.grpcClient.VolumeUnmapMarkSnapChainRemovedSet(string(e.Spec.BackendStoreDriver), e.Name, p.DirectToURL(e), e.Spec.UnmapMarkSnapChainRemovedEnabled) + return p.grpcClient.VolumeUnmapMarkSnapChainRemovedSet(string(e.Spec.BackendStoreDriver), e.Name, e.Spec.VolumeName, + p.DirectToURL(e), e.Spec.UnmapMarkSnapChainRemovedEnabled) } diff --git a/engineapi/snapshot.go b/engineapi/snapshot.go index b5d2fff10f..b69becdf54 100644 --- a/engineapi/snapshot.go +++ b/engineapi/snapshot.go @@ -105,12 +105,14 @@ func (e *EngineBinary) SnapshotPurgeStatus(*longhorn.Engine) (map[string]*longho // SnapshotClone calls engine binary // TODO: Deprecated, replaced by gRPC proxy -func (e *EngineBinary) SnapshotClone(engine *longhorn.Engine, snapshotName, fromControllerAddress string, fileSyncHTTPClientTimeout int64) error { - args := []string{"snapshot", "clone", "--snapshot-name", snapshotName, "--from-controller-address", fromControllerAddress} +func (e *EngineBinary) SnapshotClone(engine *longhorn.Engine, snapshotName, fromEngineAddress, fromEngineName string, + fileSyncHTTPClientTimeout int64) error { + args := []string{"snapshot", "clone", "--snapshot-name", snapshotName, "--from-controller-address", + fromEngineAddress, "--from-controller-instance-name", fromEngineName} if _, err := e.ExecuteEngineBinaryWithoutTimeout([]string{}, args...); err != nil { return errors.Wrapf(err, "error starting snapshot clone") } - logrus.Infof("Cloned snapshot %v from volume %v to volume %v", snapshotName, fromControllerAddress, e.cURL) + logrus.Infof("Cloned snapshot %v from volume %v to volume %v", snapshotName, fromEngineAddress, e.cURL) return nil } diff --git a/engineapi/types.go b/engineapi/types.go index a1592095c1..422ced9b1c 100644 --- a/engineapi/types.go +++ b/engineapi/types.go @@ -96,7 +96,7 @@ type EngineClient interface { SnapshotBackup(engine *longhorn.Engine, backupName, snapName, backupTarget, backingImageName, backingImageChecksum, compressionMethod string, concurrentLimit int, storageClassName string, labels, credential map[string]string) (string, string, error) SnapshotBackupStatus(engine *longhorn.Engine, backupName, replicaAddress string) (*longhorn.EngineBackupStatus, error) SnapshotCloneStatus(engine *longhorn.Engine) (map[string]*longhorn.SnapshotCloneStatus, error) - SnapshotClone(engine *longhorn.Engine, snapshotName, fromControllerAddress string, fileSyncHTTPClientTimeout int64) error + SnapshotClone(engine *longhorn.Engine, snapshotName, fromEngineAddress, fromEngineName string, fileSyncHTTPClientTimeout int64) error SnapshotHash(engine *longhorn.Engine, snapshotName string, rehash bool) error SnapshotHashStatus(engine *longhorn.Engine, snapshotName string) (map[string]*longhorn.HashStatus, error) From daec8286f624a4164e1f4480c89a9eea0736690a Mon Sep 17 00:00:00 2001 From: Eric Weber Date: Mon, 24 Jul 2023 16:39:59 -0500 Subject: [PATCH 3/7] Enable identity validation for deprecated EngineBinary flow Signed-off-by: Eric Weber --- controller/engine_controller.go | 9 ++--- engineapi/backup_monitor.go | 2 +- engineapi/backups.go | 18 ++++++++-- engineapi/engine.go | 64 ++++++++++++++++++++++++--------- engineapi/engine_binary.go | 9 ++--- engineapi/enginesim.go | 3 +- engineapi/proxy_backup.go | 5 +-- engineapi/snapshot.go | 11 +++++- engineapi/types.go | 11 +++--- 9 files changed, 94 insertions(+), 38 deletions(-) diff --git a/controller/engine_controller.go b/controller/engine_controller.go index 895000b758..9146f592bb 100644 --- a/controller/engine_controller.go +++ b/controller/engine_controller.go @@ -1610,10 +1610,11 @@ func GetBinaryClientForEngine(e *longhorn.Engine, engines engineapi.EngineClient } client, err = engines.NewEngineClient(&engineapi.EngineClientRequest{ - VolumeName: e.Spec.VolumeName, - EngineImage: image, - IP: e.Status.IP, - Port: e.Status.Port, + VolumeName: e.Spec.VolumeName, + EngineImage: image, + IP: e.Status.IP, + Port: e.Status.Port, + InstanceName: e.Name, }) if err != nil { return nil, err diff --git a/engineapi/backup_monitor.go b/engineapi/backup_monitor.go index d576908603..74b97b9ce1 100644 --- a/engineapi/backup_monitor.go +++ b/engineapi/backup_monitor.go @@ -294,7 +294,7 @@ func (m *BackupMonitor) syncBackupStatusFromEngineReplica() (currentBackupStatus m.backupStatus.DeepCopyInto(¤tBackupStatus) m.backupStatusLock.RUnlock() - engineBackupStatus, err = m.engineClientProxy.SnapshotBackupStatus(m.engine, m.backupName, m.replicaAddress) + engineBackupStatus, err = m.engineClientProxy.SnapshotBackupStatus(m.engine, m.backupName, m.replicaAddress, "") if err != nil { return currentBackupStatus, err } diff --git a/engineapi/backups.go b/engineapi/backups.go index 07fba655d2..30b8bcafa2 100644 --- a/engineapi/backups.go +++ b/engineapi/backups.go @@ -318,10 +318,10 @@ func (e *EngineBinary) SnapshotBackup(engine *longhorn.Engine, snapName, backupN // TODO: update when replacing this function snap, err := e.SnapshotGet(nil, snapName) if err != nil { - return "", "", errors.Wrapf(err, "error getting snapshot '%s', volume '%s'", snapName, e.name) + return "", "", errors.Wrapf(err, "error getting snapshot '%s', volume '%s'", snapName, e.volumeName) } if snap == nil { - return "", "", errors.Errorf("could not find snapshot '%s' to backup, volume '%s'", snapName, e.name) + return "", "", errors.Errorf("could not find snapshot '%s' to backup, volume '%s'", snapName, e.volumeName) } version, err := e.VersionGet(nil, true) if err != nil { @@ -365,12 +365,24 @@ func (e *EngineBinary) SnapshotBackup(engine *longhorn.Engine, snapName, backupN // SnapshotBackupStatus calls engine binary // TODO: Deprecated, replaced by gRPC proxy -func (e *EngineBinary) SnapshotBackupStatus(engine *longhorn.Engine, backupName, replicaAddress string) (*longhorn.EngineBackupStatus, error) { +func (e *EngineBinary) SnapshotBackupStatus(engine *longhorn.Engine, backupName, replicaAddress, + replicaName string) (*longhorn.EngineBackupStatus, error) { args := []string{"backup", "status", backupName} if replicaAddress != "" { args = append(args, "--replica", replicaAddress) } + // For now, we likely don't know the replica name here. Don't bother checking the binary version if we don't. + if replicaName != "" { + version, err := e.VersionGet(engine, true) + if err != nil { + return nil, err + } + if version.ClientVersion.CLIAPIVersion >= 9 { + args = append(args, "--replica-instance-name", replicaName) + } + } + output, err := e.ExecuteEngineBinary(args...) if err != nil { return nil, err diff --git a/engineapi/engine.go b/engineapi/engine.go index 327b27ca91..8dbd12eb4a 100644 --- a/engineapi/engine.go +++ b/engineapi/engine.go @@ -29,11 +29,12 @@ const ( type EngineCollection struct{} type EngineBinary struct { - name string - image string - ip string - port int - cURL string + volumeName string + image string + ip string + port int + cURL string + instanceName string } func (c *EngineCollection) NewEngineClient(request *EngineClientRequest) (*EngineBinary, error) { @@ -46,16 +47,17 @@ func (c *EngineCollection) NewEngineClient(request *EngineClientRequest) (*Engin } return &EngineBinary{ - name: request.VolumeName, - image: request.EngineImage, - ip: request.IP, - port: request.Port, - cURL: imutil.GetURL(request.IP, request.Port), + volumeName: request.VolumeName, + image: request.EngineImage, + ip: request.IP, + port: request.Port, + cURL: imutil.GetURL(request.IP, request.Port), + instanceName: request.InstanceName, }, nil } func (e *EngineBinary) Name() string { - return e.name + return e.volumeName } func (e *EngineBinary) LonghornEngineBinary() string { @@ -63,17 +65,26 @@ func (e *EngineBinary) LonghornEngineBinary() string { } func (e *EngineBinary) ExecuteEngineBinary(args ...string) (string, error) { - args = append([]string{"--url", e.cURL}, args...) + args, err := e.addFlags(args) + if err != nil { + return "", err + } return util.Execute([]string{}, e.LonghornEngineBinary(), args...) } func (e *EngineBinary) ExecuteEngineBinaryWithTimeout(timeout time.Duration, args ...string) (string, error) { - args = append([]string{"--url", e.cURL}, args...) + args, err := e.addFlags(args) + if err != nil { + return "", err + } return util.ExecuteWithTimeout(timeout, []string{}, e.LonghornEngineBinary(), args...) } func (e *EngineBinary) ExecuteEngineBinaryWithoutTimeout(envs []string, args ...string) (string, error) { - args = append([]string{"--url", e.cURL}, args...) + args, err := e.addFlags(args) + if err != nil { + return "", err + } return util.ExecuteWithoutTimeout(envs, e.LonghornEngineBinary(), args...) } @@ -98,7 +109,7 @@ func parseReplica(s string) (*Replica, error) { func (e *EngineBinary) ReplicaList(*longhorn.Engine) (map[string]*Replica, error) { output, err := e.ExecuteEngineBinary("ls") if err != nil { - return nil, errors.Wrapf(err, "failed to list replicas from controller '%s'", e.name) + return nil, errors.Wrapf(err, "failed to list replicas from controller '%s'", e.volumeName) } replicas := make(map[string]*Replica) lines := strings.Split(output, "\n") @@ -148,8 +159,12 @@ func (e *EngineBinary) ReplicaAdd(engine *longhorn.Engine, replicaName, url stri } } + if version.ClientVersion.CLIAPIVersion >= 9 { + cmd = append(cmd, "--replica-instance-name", replicaName) + } + if _, err := e.ExecuteEngineBinaryWithoutTimeout([]string{}, cmd...); err != nil { - return errors.Wrapf(err, "failed to add replica address='%s' to controller '%s'", url, e.name) + return errors.Wrapf(err, "failed to add replica address='%s' to controller '%s'", url, e.volumeName) } return nil } @@ -161,7 +176,7 @@ func (e *EngineBinary) ReplicaRemove(engine *longhorn.Engine, url string) error return err } if _, err := e.ExecuteEngineBinary("rm", url); err != nil { - return errors.Wrapf(err, "failed to rm replica address='%s' from controller '%s'", url, e.name) + return errors.Wrapf(err, "failed to rm replica address='%s' from controller '%s'", url, e.volumeName) } return nil } @@ -304,3 +319,18 @@ func (e *EngineBinary) ReplicaModeUpdate(engine *longhorn.Engine, url, mode stri func (e *EngineBinary) MetricsGet(*longhorn.Engine) (*Metrics, error) { return nil, fmt.Errorf(ErrNotImplement) } + +// addFlags always adds required flags to args. In addition, if the engine version is high enough, it adds additional +// engine identity validation flags. +func (e *EngineBinary) addFlags(args []string) ([]string, error) { + version, err := e.VersionGet(nil, true) + if err != nil { + return args, errors.Wrap(err, "failed to get engine CLI version while adding identity flags") + } + + argsToAdd := []string{"--url", e.cURL} + if version.ClientVersion.CLIAPIVersion >= 9 { + argsToAdd = append(argsToAdd, "--volume-name", e.volumeName, "--engine-instance-name", e.instanceName) + } + return append(argsToAdd, args...), nil +} diff --git a/engineapi/engine_binary.go b/engineapi/engine_binary.go index 7ba3dff56f..be242a183b 100644 --- a/engineapi/engine_binary.go +++ b/engineapi/engine_binary.go @@ -43,9 +43,10 @@ func GetEngineBinaryClient(ds *datastore.DataStore, volumeName, nodeID string) ( engineCollection := &EngineCollection{} return engineCollection.NewEngineClient(&EngineClientRequest{ - VolumeName: e.Spec.VolumeName, - EngineImage: e.Status.CurrentImage, - IP: e.Status.IP, - Port: e.Status.Port, + VolumeName: e.Spec.VolumeName, + EngineImage: e.Status.CurrentImage, + IP: e.Status.IP, + Port: e.Status.Port, + InstanceName: e.Name, }) } diff --git a/engineapi/enginesim.go b/engineapi/enginesim.go index c9e63162a8..c108d009c4 100644 --- a/engineapi/enginesim.go +++ b/engineapi/enginesim.go @@ -196,7 +196,8 @@ func (e *EngineSimulator) SnapshotBackup(engine *longhorn.Engine, backupName, sn return "", "", fmt.Errorf(ErrNotImplement) } -func (e *EngineSimulator) SnapshotBackupStatus(engine *longhorn.Engine, backupName, replicaAddress string) (*longhorn.EngineBackupStatus, error) { +func (e *EngineSimulator) SnapshotBackupStatus(engine *longhorn.Engine, backupName, replicaAddress, + replicaName string) (*longhorn.EngineBackupStatus, error) { return nil, fmt.Errorf(ErrNotImplement) } diff --git a/engineapi/proxy_backup.go b/engineapi/proxy_backup.go index b82c6f0b68..a9cfad5915 100644 --- a/engineapi/proxy_backup.go +++ b/engineapi/proxy_backup.go @@ -48,9 +48,10 @@ func (p *Proxy) SnapshotBackup(e *longhorn.Engine, snapshotName, backupName, bac return backupID, replicaAddress, nil } -func (p *Proxy) SnapshotBackupStatus(e *longhorn.Engine, backupName, replicaAddress string) (status *longhorn.EngineBackupStatus, err error) { +func (p *Proxy) SnapshotBackupStatus(e *longhorn.Engine, backupName, replicaAddress, + replicaName string) (status *longhorn.EngineBackupStatus, err error) { recv, err := p.grpcClient.SnapshotBackupStatus(string(e.Spec.BackendStoreDriver), e.Name, e.Spec.VolumeName, - p.DirectToURL(e), backupName, replicaAddress, "") + p.DirectToURL(e), backupName, replicaAddress, replicaName) if err != nil { return nil, err } diff --git a/engineapi/snapshot.go b/engineapi/snapshot.go index b69becdf54..dfe6467d94 100644 --- a/engineapi/snapshot.go +++ b/engineapi/snapshot.go @@ -108,7 +108,16 @@ func (e *EngineBinary) SnapshotPurgeStatus(*longhorn.Engine) (map[string]*longho func (e *EngineBinary) SnapshotClone(engine *longhorn.Engine, snapshotName, fromEngineAddress, fromEngineName string, fileSyncHTTPClientTimeout int64) error { args := []string{"snapshot", "clone", "--snapshot-name", snapshotName, "--from-controller-address", - fromEngineAddress, "--from-controller-instance-name", fromEngineName} + fromEngineAddress} + + version, err := e.VersionGet(engine, true) + if err != nil { + return err + } + if version.ClientVersion.CLIAPIVersion >= 9 { + args = append(args, "--from-controller-instance-name", fromEngineName) + } + if _, err := e.ExecuteEngineBinaryWithoutTimeout([]string{}, args...); err != nil { return errors.Wrapf(err, "error starting snapshot clone") } diff --git a/engineapi/types.go b/engineapi/types.go index 422ced9b1c..df0c6c4cd7 100644 --- a/engineapi/types.go +++ b/engineapi/types.go @@ -94,7 +94,7 @@ type EngineClient interface { SnapshotPurge(engine *longhorn.Engine) error SnapshotPurgeStatus(engine *longhorn.Engine) (map[string]*longhorn.PurgeStatus, error) SnapshotBackup(engine *longhorn.Engine, backupName, snapName, backupTarget, backingImageName, backingImageChecksum, compressionMethod string, concurrentLimit int, storageClassName string, labels, credential map[string]string) (string, string, error) - SnapshotBackupStatus(engine *longhorn.Engine, backupName, replicaAddress string) (*longhorn.EngineBackupStatus, error) + SnapshotBackupStatus(engine *longhorn.Engine, backupName, replicaAddress, replicaName string) (*longhorn.EngineBackupStatus, error) SnapshotCloneStatus(engine *longhorn.Engine) (map[string]*longhorn.SnapshotCloneStatus, error) SnapshotClone(engine *longhorn.Engine, snapshotName, fromEngineAddress, fromEngineName string, fileSyncHTTPClientTimeout int64) error SnapshotHash(engine *longhorn.Engine, snapshotName string, rehash bool) error @@ -107,10 +107,11 @@ type EngineClient interface { } type EngineClientRequest struct { - VolumeName string - EngineImage string - IP string - Port int + VolumeName string + EngineImage string + IP string + Port int + InstanceName string } type EngineClientCollection interface { From cebd71a1b4eff15de777cb5401c336a8f74e9575 Mon Sep 17 00:00:00 2001 From: Eric Weber Date: Tue, 25 Jul 2023 10:22:58 -0500 Subject: [PATCH 4/7] Add validation flags to engine during live upgrade Signed-off-by: Eric Weber --- engineapi/instance_manager.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/engineapi/instance_manager.go b/engineapi/instance_manager.go index d9f6069e77..3251ba46e9 100644 --- a/engineapi/instance_manager.go +++ b/engineapi/instance_manager.go @@ -699,6 +699,10 @@ func (c *InstanceManagerClient) engineInstanceUpgrade(req *EngineInstanceUpgrade } } + if req.EngineCLIAPIVersion >= 9 { + args = append([]string{"--engine-instance-name", req.Engine.Name}, args...) + } + binary := filepath.Join(types.GetEngineBinaryDirectoryForEngineManagerContainer(req.Engine.Spec.EngineImage), types.EngineBinaryName) if c.GetAPIVersion() < 4 { From fa44b99ba1901502b5b42631f19ffb71cf3fbf22 Mon Sep 17 00:00:00 2001 From: Eric Weber Date: Tue, 25 Jul 2023 15:44:44 -0500 Subject: [PATCH 5/7] Fix SnapshotClone with engine identity validation enabled Signed-off-by: Eric Weber --- controller/engine_controller.go | 4 ++-- engineapi/enginesim.go | 2 +- engineapi/proxy_snapshot.go | 4 ++-- engineapi/snapshot.go | 4 ++-- engineapi/types.go | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/controller/engine_controller.go b/controller/engine_controller.go index 9146f592bb..318cad2969 100644 --- a/controller/engine_controller.go +++ b/controller/engine_controller.go @@ -1565,8 +1565,8 @@ func cloneSnapshot(engine *longhorn.Engine, engineClientProxy engineapi.EngineCl } sourceEngineControllerURL := imutil.GetURL(sourceEngine.Status.StorageIP, sourceEngine.Status.Port) - if err := engineClientProxy.SnapshotClone(engine, snapshotName, sourceEngineControllerURL, sourceEngine.Name, - fileSyncHTTPClientTimeout); err != nil { + if err := engineClientProxy.SnapshotClone(engine, snapshotName, sourceEngineControllerURL, + sourceEngine.Spec.VolumeName, sourceEngine.Name, fileSyncHTTPClientTimeout); err != nil { // There is only 1 replica during volume cloning, // so if the cloning failed, it must be that the replica failed to clone. for _, status := range engine.Status.CloneStatus { diff --git a/engineapi/enginesim.go b/engineapi/enginesim.go index c108d009c4..8d672ac2e5 100644 --- a/engineapi/enginesim.go +++ b/engineapi/enginesim.go @@ -217,7 +217,7 @@ func (e *EngineSimulator) BackupRestore(engine *longhorn.Engine, backupTarget, b return fmt.Errorf(ErrNotImplement) } -func (e *EngineSimulator) SnapshotClone(engine *longhorn.Engine, snapshotName, fromEngineAddress, +func (e *EngineSimulator) SnapshotClone(engine *longhorn.Engine, snapshotName, fromEngineAddress, fromVolumeName, fromEngineName string, fileSyncHTTPClientTimeout int64) error { return fmt.Errorf(ErrNotImplement) } diff --git a/engineapi/proxy_snapshot.go b/engineapi/proxy_snapshot.go index 4d65e09283..917a59cf8e 100644 --- a/engineapi/proxy_snapshot.go +++ b/engineapi/proxy_snapshot.go @@ -32,10 +32,10 @@ func (p *Proxy) SnapshotGet(e *longhorn.Engine, name string) (snapshot *longhorn return recv[name], nil } -func (p *Proxy) SnapshotClone(e *longhorn.Engine, snapshotName, fromEngineAddress, fromEngineName string, +func (p *Proxy) SnapshotClone(e *longhorn.Engine, snapshotName, fromEngineAddress, fromVolumeName, fromEngineName string, fileSyncHTTPClientTimeout int64) (err error) { return p.grpcClient.SnapshotClone(string(e.Spec.BackendStoreDriver), e.Name, e.Spec.VolumeName, p.DirectToURL(e), - snapshotName, fromEngineAddress, fromEngineName, int(fileSyncHTTPClientTimeout)) + snapshotName, fromEngineAddress, fromVolumeName, fromEngineName, int(fileSyncHTTPClientTimeout)) } func (p *Proxy) SnapshotCloneStatus(e *longhorn.Engine) (status map[string]*longhorn.SnapshotCloneStatus, err error) { diff --git a/engineapi/snapshot.go b/engineapi/snapshot.go index dfe6467d94..d9f3fd9d9c 100644 --- a/engineapi/snapshot.go +++ b/engineapi/snapshot.go @@ -105,8 +105,8 @@ func (e *EngineBinary) SnapshotPurgeStatus(*longhorn.Engine) (map[string]*longho // SnapshotClone calls engine binary // TODO: Deprecated, replaced by gRPC proxy -func (e *EngineBinary) SnapshotClone(engine *longhorn.Engine, snapshotName, fromEngineAddress, fromEngineName string, - fileSyncHTTPClientTimeout int64) error { +func (e *EngineBinary) SnapshotClone(engine *longhorn.Engine, snapshotName, fromEngineAddress, fromVolumeName, + fromEngineName string, fileSyncHTTPClientTimeout int64) error { args := []string{"snapshot", "clone", "--snapshot-name", snapshotName, "--from-controller-address", fromEngineAddress} diff --git a/engineapi/types.go b/engineapi/types.go index df0c6c4cd7..f7518bdeed 100644 --- a/engineapi/types.go +++ b/engineapi/types.go @@ -96,7 +96,7 @@ type EngineClient interface { SnapshotBackup(engine *longhorn.Engine, backupName, snapName, backupTarget, backingImageName, backingImageChecksum, compressionMethod string, concurrentLimit int, storageClassName string, labels, credential map[string]string) (string, string, error) SnapshotBackupStatus(engine *longhorn.Engine, backupName, replicaAddress, replicaName string) (*longhorn.EngineBackupStatus, error) SnapshotCloneStatus(engine *longhorn.Engine) (map[string]*longhorn.SnapshotCloneStatus, error) - SnapshotClone(engine *longhorn.Engine, snapshotName, fromEngineAddress, fromEngineName string, fileSyncHTTPClientTimeout int64) error + SnapshotClone(engine *longhorn.Engine, snapshotName, fromEngineAddress, fromVolumeName, fromEngineName string, fileSyncHTTPClientTimeout int64) error SnapshotHash(engine *longhorn.Engine, snapshotName string, rehash bool) error SnapshotHashStatus(engine *longhorn.Engine, snapshotName string) (map[string]*longhorn.HashStatus, error) From d36fc04f8757d68b0c93387e40b2ef10632b5ab8 Mon Sep 17 00:00:00 2001 From: Eric Weber Date: Tue, 1 Aug 2023 12:13:36 -0500 Subject: [PATCH 6/7] Bump CurrentInstanceManagerAPIVersion Signed-off-by: Eric Weber --- engineapi/instance_manager.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engineapi/instance_manager.go b/engineapi/instance_manager.go index 3251ba46e9..9de12b4bea 100644 --- a/engineapi/instance_manager.go +++ b/engineapi/instance_manager.go @@ -20,7 +20,7 @@ import ( ) const ( - CurrentInstanceManagerAPIVersion = 4 + CurrentInstanceManagerAPIVersion = 5 MinInstanceManagerAPIVersion = 1 UnknownInstanceManagerAPIVersion = 0 From 460b23bc72b7914237e76345a9de8a22c16451e7 Mon Sep 17 00:00:00 2001 From: James Lu Date: Tue, 8 Aug 2023 15:26:38 +0800 Subject: [PATCH 7/7] fix(recurring-job): failed with backup failed Recurring job pod status should be failed (error) if it creates and starts a backup or snapshot failed. Recurring job will start a new pod to start a new backup because setting RestartPolicy `onFailure`. Ref: 4255 Signed-off-by: James Lu --- app/recurring_job.go | 104 ++++++++++++++++++++++++------------------- 1 file changed, 58 insertions(+), 46 deletions(-) diff --git a/app/recurring_job.go b/app/recurring_job.go index 78b8b421ca..c3eebbeb06 100644 --- a/app/recurring_job.go +++ b/app/recurring_job.go @@ -8,13 +8,14 @@ import ( "sort" "strconv" "strings" - "sync" "time" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/urfave/cli" + "golang.org/x/sync/errgroup" + corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" @@ -71,15 +72,14 @@ func RecurringJobCmd() cli.Command { }, Action: func(c *cli.Context) { if err := recurringJob(c); err != nil { - logrus.WithError(err).Fatal("Failed to snapshot") + logrus.WithError(err).Fatal("Failed to do a recurring job") } }, } } -func recurringJob(c *cli.Context) error { +func recurringJob(c *cli.Context) (err error) { logger := logrus.StandardLogger() - var err error var managerURL string = c.String(FlagManagerURL) if managerURL == "" { @@ -108,6 +108,7 @@ func recurringJob(c *cli.Context) error { var jobGroups []string = recurringJob.Spec.Groups var jobRetain int = recurringJob.Spec.Retain var jobConcurrent int = recurringJob.Spec.Concurrency + jobTask := recurringJob.Spec.Task jobLabelMap := map[string]string{} if recurringJob.Spec.Labels != nil { @@ -142,51 +143,62 @@ func recurringJob(c *cli.Context) error { logger.Infof("Found %v volumes with recurring job %v", len(filteredVolumes), jobName) concurrentLimiter := make(chan struct{}, jobConcurrent) - var wg sync.WaitGroup - defer wg.Wait() + ewg := &errgroup.Group{} + defer func() { + if wgError := ewg.Wait(); wgError != nil { + err = wgError + } + }() for _, volumeName := range filteredVolumes { - wg.Add(1) - go func(volumeName string) { - concurrentLimiter <- struct{}{} - defer func() { - <-concurrentLimiter - wg.Done() - }() - - log := logger.WithFields(logrus.Fields{ - "job": jobName, - "volume": volumeName, - "task": recurringJob.Spec.Task, - "retain": jobRetain, - "concurrent": jobConcurrent, - "groups": strings.Join(jobGroups, ","), - "labels": string(labelJSON), - }) - log.Info("Creating job") - - snapshotName := sliceStringSafely(types.GetCronJobNameForRecurringJob(jobName), 0, 8) + "-" + util.UUID() - job, err := NewJob( - logger, - managerURL, - volumeName, - snapshotName, - jobLabelMap, - jobRetain, - recurringJob.Spec.Task) - if err != nil { - log.WithError(err).Error("Failed to create new job for volume") - return - } - err = job.run() - if err != nil { - log.WithError(err).Errorf("Failed to run job for volume") - return - } + startJobVolumeName := volumeName + ewg.Go(func() error { + return startVolumeJob(startJobVolumeName, logger, concurrentLimiter, managerURL, jobName, jobTask, jobRetain, jobConcurrent, jobGroups, jobLabelMap, labelJSON) + }) + } - log.Info("Created job") - }(volumeName) + return err +} + +func startVolumeJob( + volumeName string, logger *logrus.Logger, concurrentLimiter chan struct{}, managerURL string, + jobName string, jobTask longhorn.RecurringJobType, jobRetain int, jobConcurrent int, jobGroups []string, jobLabelMap map[string]string, labelJSON []byte) error { + + concurrentLimiter <- struct{}{} + defer func() { + <-concurrentLimiter + }() + + log := logger.WithFields(logrus.Fields{ + "job": jobName, + "volume": volumeName, + "task": jobTask, + "retain": jobRetain, + "concurrent": jobConcurrent, + "groups": strings.Join(jobGroups, ","), + "labels": string(labelJSON), + }) + log.Info("Creating job") + + snapshotName := sliceStringSafely(types.GetCronJobNameForRecurringJob(jobName), 0, 8) + "-" + util.UUID() + job, err := newJob( + logger, + managerURL, + volumeName, + snapshotName, + jobLabelMap, + jobRetain, + jobTask) + if err != nil { + log.WithError(err).Error("Failed to create new job for volume") + return err + } + err = job.run() + if err != nil { + log.WithError(err).Errorf("Failed to run job for volume") + return err } + log.Info("Created job") return nil } @@ -200,7 +212,7 @@ func sliceStringSafely(s string, begin, end int) string { return s[begin:end] } -func NewJob(logger logrus.FieldLogger, managerURL, volumeName, snapshotName string, labels map[string]string, retain int, task longhorn.RecurringJobType) (*Job, error) { +func newJob(logger logrus.FieldLogger, managerURL, volumeName, snapshotName string, labels map[string]string, retain int, task longhorn.RecurringJobType) (*Job, error) { namespace := os.Getenv(types.EnvPodNamespace) if namespace == "" { return nil, fmt.Errorf("failed detect pod namespace, environment variable %v is missing", types.EnvPodNamespace)