From 7bc70ba237c4f1e56d8fb67f17775bbf5579e8fd Mon Sep 17 00:00:00 2001 From: Eric Weber Date: Wed, 10 May 2023 16:04:05 -0500 Subject: [PATCH] Use instance name in ReplicaAdd Signed-off-by: Eric Weber --- controller/engine_controller.go | 4 +- engineapi/engine.go | 6 +- engineapi/enginesim.go | 7 +- engineapi/enginesim_test.go | 2 +- engineapi/proxy_replica.go | 4 +- engineapi/types.go | 4 +- .../pkg/client/proxy_replica.go | 6 +- .../pkg/imrpc/proxy.pb.go | 277 +++++++++--------- .../pkg/imrpc/proxy.proto | 1 + 9 files changed, 165 insertions(+), 146 deletions(-) diff --git a/controller/engine_controller.go b/controller/engine_controller.go index 19df7c3e39..2eed3bda53 100644 --- a/controller/engine_controller.go +++ b/controller/engine_controller.go @@ -1816,12 +1816,12 @@ func (ec *EngineController) startRebuilding(e *longhorn.Engine, replicaName, add if e.Spec.NodeID != "" { ec.eventRecorder.Eventf(e, v1.EventTypeNormal, constant.EventReasonRebuilding, "Start rebuilding replica %v with Address %v for restore engine %v and volume %v", replicaName, addr, e.Name, e.Spec.VolumeName) - err = engineClientProxy.ReplicaAdd(e, replicaURL, true, fastReplicaRebuild, fileSyncHTTPClientTimeout) + err = engineClientProxy.ReplicaAdd(e, replicaURL, true, fastReplicaRebuild, fileSyncHTTPClientTimeout, replicaName) } } else { ec.eventRecorder.Eventf(e, v1.EventTypeNormal, constant.EventReasonRebuilding, "Start rebuilding replica %v with Address %v for normal engine %v and volume %v", replicaName, addr, e.Name, e.Spec.VolumeName) - err = engineClientProxy.ReplicaAdd(e, replicaURL, false, fastReplicaRebuild, fileSyncHTTPClientTimeout) + err = engineClientProxy.ReplicaAdd(e, replicaURL, false, fastReplicaRebuild, fileSyncHTTPClientTimeout, replicaName) } if err != nil { replicaRebuildErrMsg := err.Error() diff --git a/engineapi/engine.go b/engineapi/engine.go index 0aa93331ac..58051bd45e 100644 --- a/engineapi/engine.go +++ b/engineapi/engine.go @@ -120,7 +120,7 @@ func (e *EngineBinary) ReplicaList(*longhorn.Engine) (map[string]*Replica, error // ReplicaAdd calls engine binary // TODO: Deprecated, replaced by gRPC proxy -func (e *EngineBinary) ReplicaAdd(engine *longhorn.Engine, url string, isRestoreVolume, fastSync bool, replicaFileSyncHTTPClientTimeout int64) error { +func (e *EngineBinary) ReplicaAdd(engine *longhorn.Engine, url string, isRestoreVolume, fastSync bool, replicaFileSyncHTTPClientTimeout int64, replicaInstanceName string) error { if err := ValidateReplicaURL(url); err != nil { return err } @@ -148,6 +148,10 @@ func (e *EngineBinary) ReplicaAdd(engine *longhorn.Engine, url string, isRestore } } + if version.ClientVersion.CLIAPIVersion >= 9 { + cmd = append(cmd, "--instance-name", replicaInstanceName) + } + if _, err := e.ExecuteEngineBinaryWithoutTimeout([]string{}, cmd...); err != nil { return errors.Wrapf(err, "failed to add replica address='%s' to controller '%s'", url, e.name) } diff --git a/engineapi/enginesim.go b/engineapi/enginesim.go index 76f30e4e0f..458893564e 100644 --- a/engineapi/enginesim.go +++ b/engineapi/enginesim.go @@ -45,7 +45,7 @@ func (c *EngineSimulatorCollection) CreateEngineSimulator(request *EngineSimulat mutex: &sync.RWMutex{}, } for _, addr := range request.ReplicaAddrs { - if err := s.ReplicaAdd(&longhorn.Engine{}, addr, false, false, 30); err != nil { + if err := s.ReplicaAdd(&longhorn.Engine{}, addr, false, false, 30, ""); err != nil { // TODO: Do I need to do something here? return err } } @@ -121,7 +121,7 @@ func (e *EngineSimulator) ReplicaList(*longhorn.Engine) (map[string]*Replica, er return ret, nil } -func (e *EngineSimulator) ReplicaAdd(engine *longhorn.Engine, url string, isRestoreVolume, fastSync bool, replicaFileSyncHTTPClientTimeout int64) error { +func (e *EngineSimulator) ReplicaAdd(engine *longhorn.Engine, url string, isRestoreVolume, fastSync bool, replicaFileSyncHTTPClientTimeout int64, instanceName string) error { e.mutex.Lock() defer e.mutex.Unlock() @@ -137,6 +137,9 @@ func (e *EngineSimulator) ReplicaAdd(engine *longhorn.Engine, url string, isRest URL: url, Mode: longhorn.ReplicaModeRW, } + + // TODO: Do I need to do something here? + return nil } diff --git a/engineapi/enginesim_test.go b/engineapi/enginesim_test.go index db2183ce87..879a68f496 100644 --- a/engineapi/enginesim_test.go +++ b/engineapi/enginesim_test.go @@ -64,7 +64,7 @@ func (s *TestSuite) TestBasic(c *C) { c.Assert(replicas, HasLen, 1) c.Assert(replicas[Replica1Addr].Mode, Equals, longhorn.ReplicaModeRW) - err = sim.ReplicaAdd(e, Replica3Addr, false, false, 30) + err = sim.ReplicaAdd(e, Replica3Addr, false, false, 30, "") // TODO: Do I need to do something here? replicas, err = sim.ReplicaList(e) c.Assert(err, IsNil) c.Assert(replicas, HasLen, 2) diff --git a/engineapi/proxy_replica.go b/engineapi/proxy_replica.go index 034ff496bd..a161720315 100644 --- a/engineapi/proxy_replica.go +++ b/engineapi/proxy_replica.go @@ -4,8 +4,8 @@ import ( longhorn "github.com/longhorn/longhorn-manager/k8s/pkg/apis/longhorn/v1beta2" ) -func (p *Proxy) ReplicaAdd(e *longhorn.Engine, address string, restore, fastSync bool, replicaFileSyncHTTPClientTimeout int64) (err error) { - return p.grpcClient.ReplicaAdd(p.ToProxyEngineRequest(e), address, restore, e.Spec.VolumeSize, e.Status.CurrentSize, int(replicaFileSyncHTTPClientTimeout), fastSync) +func (p *Proxy) ReplicaAdd(e *longhorn.Engine, address string, restore, fastSync bool, replicaFileSyncHTTPClientTimeout int64, instanceName string) (err error) { + return p.grpcClient.ReplicaAdd(p.ToProxyEngineRequest(e), address, restore, e.Spec.VolumeSize, e.Status.CurrentSize, int(replicaFileSyncHTTPClientTimeout), fastSync, instanceName) } func (p *Proxy) ReplicaRemove(e *longhorn.Engine, address string) (err error) { diff --git a/engineapi/types.go b/engineapi/types.go index f814dcb555..2c5d14eecb 100644 --- a/engineapi/types.go +++ b/engineapi/types.go @@ -13,7 +13,7 @@ import ( const ( // CurrentCLIVersion indicates the default API version manager used to talk with the // engine, including `longhorn-engine` and `longhorn-instance-manager` - CurrentCLIVersion = 7 + CurrentCLIVersion = 9 // MinCLIVersion indicates the Min API version manager used to talk with the // engine. MinCLIVersion = 3 @@ -76,7 +76,7 @@ type EngineClient interface { VolumeUnmapMarkSnapChainRemovedSet(engine *longhorn.Engine) error ReplicaList(*longhorn.Engine) (map[string]*Replica, error) - ReplicaAdd(engine *longhorn.Engine, url string, isRestoreVolume, fastSync bool, replicaFileSyncHTTPClientTimeout int64) error + ReplicaAdd(engine *longhorn.Engine, url string, isRestoreVolume, fastSync bool, replicaFileSyncHTTPClientTimeout int64, instanceName string) error ReplicaRemove(engine *longhorn.Engine, url string) error ReplicaRebuildStatus(*longhorn.Engine) (map[string]*longhorn.RebuildStatus, error) ReplicaRebuildVerify(engine *longhorn.Engine, url string) error 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 b5b2729482..fa8b0dab49 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 @@ -9,9 +9,10 @@ import ( eptypes "github.com/longhorn/longhorn-engine/proto/ptypes" ) -func (c *ProxyClient) ReplicaAdd(engineDetails rpc.ProxyEngineRequest, replicaAddress string, restore bool, size, currentSize int64, fileSyncHTTPClientTimeout int, fastSync bool) (err error) { +func (c *ProxyClient) ReplicaAdd(engineDetails rpc.ProxyEngineRequest, replicaAddress string, restore bool, size, currentSize int64, fileSyncHTTPClientTimeout int, fastSync bool, replicaInstanceName string) (err error) { otherParams := map[string]string{ - "replicaAddress": replicaAddress, + "replicaAddress": replicaAddress, + "replicaInstanceName": replicaInstanceName, } if err := validateProxyMethodParameters(engineDetails, otherParams); err != nil { return errors.Wrap(err, "failed to add replica for volume") @@ -33,6 +34,7 @@ func (c *ProxyClient) ReplicaAdd(engineDetails rpc.ProxyEngineRequest, replicaAd CurrentSize: currentSize, FastSync: fastSync, FileSyncHttpClientTimeout: int32(fileSyncHTTPClientTimeout), + ReplicaInstanceName: replicaInstanceName, } _, err = c.service.ReplicaAdd(getContextWithGRPCLongTimeout(c.ctx), req) if err != nil { 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 aa5c7dce23..106b20e0b1 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 @@ -1382,6 +1382,7 @@ type EngineReplicaAddRequest struct { CurrentSize int64 `protobuf:"varint,5,opt,name=current_size,json=currentSize,proto3" json:"current_size,omitempty"` FastSync bool `protobuf:"varint,6,opt,name=fast_sync,json=fastSync,proto3" json:"fast_sync,omitempty"` FileSyncHttpClientTimeout int32 `protobuf:"varint,7,opt,name=file_sync_http_client_timeout,json=fileSyncHttpClientTimeout,proto3" json:"file_sync_http_client_timeout,omitempty"` + ReplicaInstanceName string `protobuf:"bytes,8,opt,name=replica_instance_name,json=replicaInstanceName,proto3" json:"replica_instance_name,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1461,6 +1462,13 @@ func (m *EngineReplicaAddRequest) GetFileSyncHttpClientTimeout() int32 { return 0 } +func (m *EngineReplicaAddRequest) GetReplicaInstanceName() string { + if m != nil { + return m.ReplicaInstanceName + } + return "" +} + type EngineReplicaListProxyResponse struct { ReplicaList *ptypes.ReplicaListReply `protobuf:"bytes,1,opt,name=replica_list,json=replicaList,proto3" json:"replica_list,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -1919,145 +1927,146 @@ func init() { func init() { proto.RegisterFile("proxy.proto", fileDescriptor_700b50b08ed8dbaf) } var fileDescriptor_700b50b08ed8dbaf = []byte{ - // 2208 bytes of a gzipped FileDescriptorProto + // 2224 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0x4f, 0x73, 0x1c, 0x47, - 0x15, 0xaf, 0x95, 0xb4, 0xab, 0xd5, 0x5b, 0xfd, 0x4b, 0x5b, 0x28, 0xeb, 0x55, 0x9c, 0x48, 0xe3, - 0xd8, 0xb2, 0x8b, 0x78, 0x55, 0xd8, 0x54, 0xb0, 0x9d, 0x8b, 0x8d, 0x22, 0xdb, 0x8a, 0x2d, 0x12, - 0x46, 0xb1, 0x81, 0x0a, 0xc9, 0xd4, 0x68, 0xb6, 0x77, 0x77, 0xd0, 0xfc, 0xa3, 0xa7, 0x47, 0x58, - 0x1c, 0x28, 0xf8, 0x0a, 0x70, 0x81, 0x03, 0x55, 0x5c, 0xb8, 0x70, 0x84, 0x1b, 0x1c, 0x72, 0xe0, - 0xcc, 0x1d, 0x8a, 0x2a, 0xbe, 0x04, 0x5f, 0x80, 0xea, 0x7f, 0xb3, 0xd3, 0xb3, 0x3d, 0xbb, 0x12, - 0xa9, 0xad, 0xdc, 0x66, 0x5e, 0xbf, 0x7e, 0xef, 0xd7, 0xaf, 0xdf, 0x7b, 0xfd, 0xfa, 0x35, 0xb4, - 0x12, 0x12, 0xbf, 0x3e, 0xef, 0x26, 0x24, 0xa6, 0x31, 0xaa, 0xfb, 0x21, 0x49, 0xbc, 0xce, 0xd6, - 0x20, 0x8e, 0x07, 0x01, 0xde, 0xe3, 0xc4, 0x93, 0xac, 0xbf, 0x87, 0xc3, 0x84, 0x4a, 0x9e, 0xce, - 0xe3, 0x81, 0x4f, 0x87, 0xd9, 0x49, 0xd7, 0x8b, 0xc3, 0xbd, 0x20, 0x8e, 0x06, 0xc3, 0x98, 0x44, - 0xf9, 0xc7, 0x1d, 0x1c, 0x0d, 0xfc, 0x48, 0xce, 0xdc, 0x4b, 0xe8, 0x79, 0x82, 0xd3, 0x3d, 0x2f, + 0x15, 0xaf, 0x95, 0xb4, 0xab, 0xd5, 0x5b, 0xfd, 0x4b, 0x4b, 0x51, 0xd6, 0xab, 0x38, 0xb1, 0xc7, + 0xb1, 0x65, 0x17, 0xf1, 0xaa, 0x90, 0xa9, 0x60, 0x3b, 0x17, 0x1b, 0x45, 0xb6, 0x15, 0x5b, 0x24, + 0x8c, 0x62, 0x03, 0x15, 0x92, 0xa9, 0xd1, 0x6c, 0xef, 0xee, 0xa0, 0xf9, 0x47, 0x4f, 0x8f, 0xb0, + 0x38, 0x50, 0xf0, 0x15, 0xe0, 0x02, 0x07, 0xaa, 0xb8, 0x70, 0xe1, 0x08, 0x37, 0x38, 0x70, 0xe0, + 0xcc, 0x1d, 0x8a, 0x2a, 0xbe, 0x44, 0xbe, 0x00, 0xd5, 0xff, 0x66, 0xa7, 0x67, 0x7b, 0x76, 0x25, + 0xa8, 0xad, 0xdc, 0x66, 0x5e, 0xbf, 0x7e, 0xef, 0xd7, 0xaf, 0xdf, 0x7b, 0xfd, 0xfa, 0x35, 0xb4, + 0x12, 0x12, 0xbf, 0x3e, 0xef, 0x26, 0x24, 0xa6, 0x31, 0xaa, 0xfb, 0x21, 0x49, 0xbc, 0xce, 0xf6, + 0x20, 0x8e, 0x07, 0x01, 0xde, 0xe5, 0xc4, 0x93, 0xac, 0xbf, 0x8b, 0xc3, 0x84, 0x4a, 0x9e, 0xce, + 0xe3, 0x81, 0x4f, 0x87, 0xd9, 0x49, 0xd7, 0x8b, 0xc3, 0xdd, 0x20, 0x8e, 0x06, 0xc3, 0x98, 0x44, + 0xf9, 0xc7, 0x5d, 0x1c, 0x0d, 0xfc, 0x48, 0xce, 0xdc, 0x4d, 0xe8, 0x79, 0x82, 0xd3, 0x5d, 0x2f, 0x8e, 0x28, 0x89, 0x83, 0x00, 0x13, 0x29, 0xe2, 0xd1, 0xa5, 0x45, 0xa4, 0xe7, 0x91, 0xe7, 0x0e, - 0x70, 0x44, 0x85, 0x04, 0x8b, 0x02, 0xfa, 0x84, 0xe1, 0x3e, 0xe0, 0xbc, 0x36, 0xfe, 0x69, 0x86, - 0x53, 0x8a, 0xda, 0xb0, 0xe8, 0xf6, 0x7a, 0x04, 0xa7, 0x69, 0xbb, 0xb6, 0x5d, 0xbb, 0xb5, 0x64, - 0xab, 0x5f, 0xf4, 0x0e, 0xb4, 0xce, 0xe2, 0x20, 0x0b, 0xb1, 0x13, 0xb9, 0x21, 0x6e, 0xcf, 0xf1, - 0x51, 0x10, 0xa4, 0xef, 0xb9, 0x21, 0x46, 0xd7, 0x61, 0xc5, 0x8f, 0x52, 0xea, 0x46, 0x9e, 0x64, - 0x99, 0xe7, 0x2c, 0xcb, 0x8a, 0xc8, 0x98, 0xac, 0x23, 0xe8, 0x08, 0x85, 0xaf, 0x30, 0x49, 0xfd, - 0x38, 0xe2, 0x10, 0x6c, 0x9c, 0x26, 0x71, 0x94, 0x62, 0xb4, 0x07, 0x8b, 0x67, 0x82, 0xce, 0xb5, - 0xb7, 0xee, 0x7e, 0xa3, 0x2b, 0xd0, 0x77, 0x25, 0xfb, 0xc7, 0x19, 0x4d, 0x32, 0x6a, 0x2b, 0x2e, - 0xeb, 0x09, 0xbc, 0x25, 0xc5, 0x71, 0x1c, 0x4f, 0x31, 0xd5, 0x05, 0xde, 0x84, 0x86, 0x40, 0x28, - 0xe5, 0xad, 0xe6, 0xf2, 0x38, 0xd5, 0x96, 0xa3, 0xd6, 0xef, 0x6b, 0x70, 0xb5, 0x28, 0xe8, 0xe0, - 0x75, 0xe2, 0x46, 0x3d, 0x65, 0x94, 0xe7, 0xb0, 0xc1, 0xb7, 0xd8, 0x11, 0x76, 0x75, 0x88, 0xa0, - 0x4b, 0x99, 0x57, 0xbb, 0x7c, 0xcb, 0xbb, 0xe3, 0xd6, 0xb4, 0x51, 0x32, 0x6e, 0xe1, 0x7b, 0xd0, - 0xc0, 0x5c, 0x3a, 0x37, 0x61, 0xeb, 0xee, 0x96, 0x0e, 0x49, 0xd3, 0x6c, 0x4b, 0x56, 0xeb, 0xaf, - 0x35, 0xd8, 0x2e, 0xe2, 0x7b, 0x42, 0xe2, 0x88, 0xe2, 0xa8, 0x77, 0x4c, 0x5d, 0x42, 0x67, 0x02, - 0xf3, 0x10, 0x56, 0xfb, 0x52, 0x89, 0x93, 0x32, 0x2d, 0x12, 0xae, 0xa5, 0xc3, 0x35, 0x01, 0xb1, - 0x57, 0xfa, 0x45, 0xaa, 0xf5, 0xe7, 0x1a, 0x6c, 0x15, 0xc1, 0x1f, 0x47, 0x6e, 0x92, 0x0e, 0xe3, - 0xd9, 0xe0, 0x7e, 0x02, 0x6b, 0xa9, 0x94, 0xef, 0xc8, 0xad, 0x17, 0xc0, 0xaf, 0xe9, 0xc0, 0x4b, - 0x20, 0xec, 0x55, 0x35, 0x4b, 0x0c, 0x5b, 0x3f, 0x86, 0x1d, 0x13, 0x66, 0xdd, 0xbd, 0xbe, 0x03, - 0x4d, 0x35, 0x4d, 0xa2, 0xdd, 0xaa, 0xd2, 0x92, 0x04, 0xe7, 0x76, 0xce, 0x6c, 0xfd, 0xab, 0x06, - 0x7b, 0x45, 0xf1, 0x2f, 0xa3, 0xd0, 0x4d, 0x8e, 0x5c, 0x72, 0xca, 0x26, 0xec, 0x0f, 0x5d, 0x3f, - 0xb2, 0x71, 0x18, 0x9f, 0xe1, 0xde, 0x31, 0x9e, 0x8d, 0x99, 0x7e, 0x04, 0x6b, 0x19, 0xd3, 0xe9, - 0x84, 0x2e, 0x39, 0x75, 0x18, 0x2e, 0x69, 0xa6, 0x6f, 0xe9, 0x0b, 0xb8, 0x00, 0x30, 0x7b, 0x25, - 0x2b, 0x32, 0x59, 0x7f, 0xaf, 0xc1, 0x3b, 0x42, 0x99, 0x5a, 0xfd, 0x0b, 0x3f, 0x2d, 0x19, 0xee, + 0x70, 0x44, 0x85, 0x04, 0x8b, 0x02, 0xfa, 0x94, 0xe1, 0x3e, 0xe0, 0xbc, 0x36, 0xfe, 0x49, 0x86, + 0x53, 0x8a, 0xda, 0xb0, 0xe8, 0xf6, 0x7a, 0x04, 0xa7, 0x69, 0xbb, 0x76, 0xad, 0x76, 0x7b, 0xc9, + 0x56, 0xbf, 0xe8, 0x5d, 0x68, 0x9d, 0xc5, 0x41, 0x16, 0x62, 0x27, 0x72, 0x43, 0xdc, 0x9e, 0xe3, + 0xa3, 0x20, 0x48, 0xdf, 0x75, 0x43, 0x8c, 0x6e, 0xc0, 0x8a, 0x1f, 0xa5, 0xd4, 0x8d, 0x3c, 0xc9, + 0x32, 0xcf, 0x59, 0x96, 0x15, 0x91, 0x31, 0x59, 0x47, 0xd0, 0x11, 0x0a, 0x5f, 0x61, 0x92, 0xfa, + 0x71, 0xc4, 0x21, 0xd8, 0x38, 0x4d, 0xe2, 0x28, 0xc5, 0x68, 0x17, 0x16, 0xcf, 0x04, 0x9d, 0x6b, + 0x6f, 0xed, 0xbd, 0xd9, 0x15, 0xe8, 0xbb, 0x92, 0xfd, 0x93, 0x8c, 0x26, 0x19, 0xb5, 0x15, 0x97, + 0xf5, 0x04, 0xde, 0x96, 0xe2, 0x38, 0x8e, 0xa7, 0x98, 0xea, 0x02, 0x6f, 0x41, 0x43, 0x20, 0x94, + 0xf2, 0x56, 0x73, 0x79, 0x9c, 0x6a, 0xcb, 0x51, 0xeb, 0x77, 0x35, 0xb8, 0x52, 0x14, 0x74, 0xf0, + 0x3a, 0x71, 0xa3, 0x9e, 0x32, 0xca, 0x73, 0xd8, 0xe4, 0x5b, 0xec, 0x08, 0xbb, 0x3a, 0x44, 0xd0, + 0xa5, 0xcc, 0x2b, 0x5d, 0xbe, 0xe5, 0xdd, 0x71, 0x6b, 0xda, 0x28, 0x19, 0xb7, 0xf0, 0x3d, 0x68, + 0x60, 0x2e, 0x9d, 0x9b, 0xb0, 0xb5, 0xb7, 0xad, 0x43, 0xd2, 0x34, 0xdb, 0x92, 0xd5, 0xfa, 0x4b, + 0x0d, 0xae, 0x15, 0xf1, 0x3d, 0x21, 0x71, 0x44, 0x71, 0xd4, 0x3b, 0xa6, 0x2e, 0xa1, 0x33, 0x81, + 0x79, 0x08, 0xab, 0x7d, 0xa9, 0xc4, 0x49, 0x99, 0x16, 0x09, 0xd7, 0xd2, 0xe1, 0x9a, 0x80, 0xd8, + 0x2b, 0xfd, 0x22, 0xd5, 0xfa, 0x53, 0x0d, 0xb6, 0x8b, 0xe0, 0x8f, 0x23, 0x37, 0x49, 0x87, 0xf1, + 0x6c, 0x70, 0x3f, 0x81, 0xb5, 0x54, 0xca, 0x77, 0xe4, 0xd6, 0x0b, 0xe0, 0x57, 0x75, 0xe0, 0x25, + 0x10, 0xf6, 0xaa, 0x9a, 0x25, 0x86, 0xad, 0x1f, 0xc1, 0x75, 0x13, 0x66, 0xdd, 0xbd, 0xbe, 0x0d, + 0x4d, 0x35, 0x4d, 0xa2, 0xdd, 0xae, 0xd2, 0x92, 0x04, 0xe7, 0x76, 0xce, 0x6c, 0xfd, 0xab, 0x06, + 0xbb, 0x45, 0xf1, 0x2f, 0xa3, 0xd0, 0x4d, 0x8e, 0x5c, 0x72, 0xca, 0x26, 0xec, 0x0f, 0x5d, 0x3f, + 0xb2, 0x71, 0x18, 0x9f, 0xe1, 0xde, 0x31, 0x9e, 0x8d, 0x99, 0x7e, 0x08, 0x6b, 0x19, 0xd3, 0xe9, + 0x84, 0x2e, 0x39, 0x75, 0x18, 0x2e, 0x69, 0xa6, 0x6f, 0xea, 0x0b, 0xb8, 0x00, 0x30, 0x7b, 0x25, + 0x2b, 0x32, 0x59, 0x7f, 0xaf, 0xc1, 0xbb, 0x42, 0x99, 0x5a, 0xfd, 0x0b, 0x3f, 0x2d, 0x19, 0xee, 0x29, 0xd4, 0x7b, 0x7e, 0x7a, 0xca, 0x92, 0xcc, 0x3c, 0x57, 0x2a, 0xc0, 0x4f, 0x99, 0xd6, 0xfd, - 0x90, 0xcd, 0x39, 0x88, 0x28, 0x39, 0xb7, 0xc5, 0xfc, 0xce, 0x0f, 0x00, 0x46, 0x44, 0xb4, 0x0e, + 0x88, 0xcd, 0x39, 0x88, 0x28, 0x39, 0xb7, 0xc5, 0xfc, 0xce, 0xf7, 0x01, 0x46, 0x44, 0xb4, 0x0e, 0xf3, 0xa7, 0xf8, 0x5c, 0x66, 0x2e, 0xf6, 0x89, 0xee, 0x41, 0xfd, 0xcc, 0x0d, 0xb2, 0x91, 0x13, - 0x98, 0x14, 0x31, 0x09, 0x87, 0x51, 0x3f, 0xb6, 0x05, 0xef, 0xc3, 0xb9, 0xfb, 0x35, 0xeb, 0x2f, - 0xf3, 0xb0, 0x69, 0xe6, 0x42, 0x08, 0x16, 0x78, 0x7e, 0x13, 0x6a, 0xf8, 0x37, 0xda, 0x84, 0x46, + 0x98, 0x14, 0x31, 0x09, 0x87, 0x51, 0x3f, 0xb6, 0x05, 0xef, 0xc3, 0xb9, 0xfb, 0x35, 0xeb, 0xcf, + 0xf3, 0xb0, 0x65, 0xe6, 0x42, 0x08, 0x16, 0x78, 0x7e, 0x13, 0x6a, 0xf8, 0x37, 0xda, 0x82, 0x46, 0xe2, 0x12, 0x1c, 0x51, 0x99, 0x18, 0xe5, 0x1f, 0x7a, 0x0a, 0x4d, 0x6f, 0xe8, 0x07, 0x3d, 0x82, - 0xa3, 0xf6, 0x3c, 0x5f, 0xeb, 0x37, 0x27, 0x42, 0xe8, 0xee, 0x4b, 0x6e, 0xb1, 0xca, 0x7c, 0x32, - 0x4b, 0xcc, 0x44, 0x58, 0xbe, 0xbd, 0xb0, 0x5d, 0xbb, 0xd5, 0xb4, 0xd5, 0x2f, 0xda, 0x81, 0xe5, - 0x2c, 0xc5, 0xc4, 0xf1, 0x08, 0x76, 0x29, 0xee, 0xb5, 0xeb, 0x7c, 0xb8, 0xc5, 0x68, 0xfb, 0x82, - 0xc4, 0x26, 0xab, 0xd1, 0x86, 0xc8, 0xea, 0xf2, 0x97, 0xad, 0x25, 0xf5, 0x7f, 0x8e, 0xdb, 0x8b, - 0x62, 0x2d, 0xec, 0x1b, 0x3d, 0x86, 0x46, 0xe0, 0x9e, 0xe0, 0x20, 0x6d, 0x37, 0x39, 0xe2, 0xdb, - 0x93, 0x11, 0xbf, 0xe0, 0xbc, 0x02, 0xaf, 0x9c, 0xd8, 0xf9, 0x00, 0x56, 0xb4, 0x85, 0x18, 0x76, - 0x66, 0xa3, 0xb8, 0x33, 0xcd, 0x82, 0xe9, 0x3b, 0x0f, 0xa0, 0x55, 0x90, 0x39, 0x6d, 0xea, 0x52, - 0x71, 0xd7, 0x7e, 0xa1, 0x32, 0xcd, 0x28, 0xf0, 0xce, 0xf0, 0x8c, 0x32, 0xa4, 0x72, 0x83, 0xb9, - 0x91, 0x1b, 0x58, 0xbf, 0xad, 0xa9, 0xf3, 0x2d, 0x4f, 0x18, 0x19, 0x19, 0xe0, 0x99, 0xe8, 0xbf, - 0x03, 0x57, 0xd2, 0x53, 0x3f, 0x71, 0xfc, 0xbe, 0xe3, 0x47, 0x4e, 0x42, 0xe2, 0x01, 0x3f, 0xb6, - 0x85, 0x39, 0xd7, 0xd9, 0xd0, 0x61, 0xff, 0x90, 0x1d, 0xb0, 0x9c, 0x6e, 0xfd, 0xbb, 0x06, 0x37, - 0x0d, 0xd0, 0x8e, 0xa9, 0x4b, 0xb3, 0x54, 0x8f, 0xce, 0xef, 0x43, 0x23, 0xe5, 0x64, 0x19, 0x9e, - 0x0f, 0x8c, 0x0e, 0x50, 0x35, 0xbd, 0x2b, 0x68, 0xd2, 0x21, 0x84, 0xa0, 0xce, 0x17, 0xd0, 0x2a, - 0x90, 0x0d, 0x7b, 0xfa, 0x40, 0x0f, 0xd4, 0xeb, 0x2a, 0x0d, 0x19, 0xb4, 0x29, 0x45, 0xc5, 0x8d, - 0xff, 0xdb, 0x5c, 0xd9, 0xf0, 0xfb, 0x41, 0x1c, 0xcd, 0xc6, 0xf0, 0xbb, 0xb0, 0xd6, 0x27, 0x71, - 0xe8, 0x8c, 0x8a, 0x32, 0xe9, 0x03, 0xec, 0xc4, 0x0c, 0xf7, 0x73, 0x2a, 0xab, 0x88, 0xf2, 0xb3, - 0xa8, 0x58, 0x11, 0x29, 0x22, 0x2f, 0x9b, 0x1e, 0xc1, 0x35, 0xfc, 0x3a, 0x89, 0x09, 0x75, 0x4e, - 0x5c, 0xef, 0xd4, 0x8f, 0x06, 0x8e, 0x1f, 0xba, 0x03, 0xcc, 0xb6, 0x15, 0xbf, 0xf6, 0x53, 0x2a, - 0xc3, 0xfd, 0xaa, 0x60, 0xfa, 0xae, 0xe0, 0x39, 0x64, 0x2c, 0x87, 0xfd, 0x03, 0xc6, 0xc0, 0x24, - 0xf4, 0xfd, 0x00, 0x3b, 0xac, 0xc2, 0x73, 0x86, 0x94, 0x26, 0x8e, 0x17, 0xf8, 0x38, 0xa2, 0x0e, - 0xf5, 0x43, 0x1c, 0x67, 0x94, 0x67, 0x84, 0xba, 0x7d, 0x95, 0x31, 0x1d, 0x9f, 0x47, 0xde, 0x33, - 0x4a, 0x93, 0x7d, 0xce, 0xf1, 0xa9, 0x60, 0x30, 0xf8, 0x06, 0xb7, 0xde, 0xff, 0xef, 0x1b, 0x55, - 0xd3, 0x67, 0xe3, 0x1b, 0x05, 0x6d, 0x26, 0xdf, 0xf8, 0x65, 0x6d, 0x3c, 0x2b, 0xb0, 0xd4, 0x39, - 0x13, 0xe7, 0xd8, 0x80, 0x3a, 0xdb, 0x6a, 0x16, 0x87, 0xf3, 0x2c, 0x37, 0xf1, 0x1f, 0xeb, 0x4f, - 0x0b, 0x65, 0x08, 0x6c, 0x23, 0xb3, 0x64, 0x56, 0x89, 0x09, 0x47, 0x67, 0x22, 0x7b, 0x2f, 0xd9, - 0xfc, 0x9b, 0x55, 0xef, 0x27, 0x5c, 0xa3, 0x56, 0xbd, 0x0b, 0x92, 0xaa, 0xde, 0xa7, 0xfb, 0xea, - 0x75, 0x58, 0x91, 0x52, 0xa8, 0x4b, 0x06, 0x58, 0xf8, 0xe6, 0x92, 0xbd, 0x2c, 0x88, 0x9f, 0x72, - 0x1a, 0x7a, 0x0f, 0x90, 0xee, 0xc9, 0x5c, 0x5c, 0x9d, 0x73, 0xae, 0x9f, 0x14, 0xfc, 0x97, 0x8b, - 0xfc, 0x36, 0x6c, 0xea, 0xdc, 0xde, 0x10, 0x7b, 0xa7, 0x69, 0x16, 0xca, 0x93, 0x6a, 0xa3, 0x38, - 0x63, 0x5f, 0x8e, 0xa1, 0x27, 0xf9, 0x11, 0xb5, 0xc8, 0xbd, 0xb0, 0x6b, 0xf4, 0x42, 0xcd, 0xc6, - 0xa6, 0x73, 0x0a, 0xdd, 0x01, 0xe4, 0xc5, 0x61, 0xc2, 0x12, 0xa4, 0x1f, 0x47, 0x4e, 0x88, 0xe9, - 0x30, 0xee, 0xb5, 0x97, 0xb8, 0xe6, 0x37, 0x0a, 0x23, 0x47, 0x7c, 0x00, 0xdd, 0x86, 0x75, 0x2f, - 0x8e, 0xbc, 0x8c, 0xb0, 0xb3, 0xdd, 0x09, 0xfc, 0xd0, 0xa7, 0x6d, 0xe0, 0xc1, 0xb5, 0x36, 0xa2, - 0xbf, 0x60, 0xe4, 0xaf, 0x72, 0x88, 0xfd, 0xaa, 0xa6, 0x6a, 0x4f, 0x7d, 0x21, 0x7a, 0x20, 0x6e, - 0xc1, 0x92, 0xdc, 0x0b, 0xbf, 0x27, 0xe5, 0x36, 0x05, 0xe1, 0xb0, 0x27, 0xaa, 0x85, 0x24, 0xf0, - 0x3d, 0x57, 0x8a, 0x57, 0xbf, 0xe8, 0x06, 0xac, 0xfa, 0xa9, 0xe3, 0x47, 0x1e, 0xc1, 0x21, 0x8e, - 0xa8, 0x1b, 0xf0, 0x8d, 0x6e, 0xda, 0x2b, 0x7e, 0x7a, 0x38, 0x22, 0xb2, 0x0b, 0x87, 0x11, 0x83, - 0x8a, 0xb2, 0x19, 0xb8, 0xed, 0x54, 0x17, 0xdd, 0x85, 0x35, 0xb9, 0x0a, 0x47, 0xdd, 0x51, 0x85, - 0x93, 0xae, 0x4a, 0xf2, 0x63, 0x41, 0xb5, 0xfe, 0x53, 0x83, 0xdd, 0x6a, 0xf0, 0xba, 0x19, 0xaf, - 0x81, 0x54, 0xe1, 0x64, 0x24, 0x90, 0x76, 0x94, 0x86, 0x7d, 0x49, 0x02, 0xb6, 0x4b, 0x98, 0x90, - 0x58, 0x65, 0x78, 0xf1, 0x83, 0x3a, 0xd0, 0xcc, 0xcf, 0xdb, 0x79, 0xbe, 0xff, 0xf9, 0xff, 0x78, - 0x20, 0x2d, 0x18, 0x02, 0x69, 0x03, 0xea, 0x2c, 0xf9, 0xa9, 0xb0, 0x10, 0x3f, 0xa6, 0x05, 0x36, - 0x8c, 0x0b, 0xfc, 0x6f, 0x5e, 0x66, 0x28, 0x17, 0x4f, 0x69, 0x4c, 0xf0, 0x4c, 0xb3, 0xc9, 0x5c, - 0x21, 0x9b, 0xac, 0xc3, 0x3c, 0xb3, 0x96, 0xb0, 0x3e, 0xfb, 0x64, 0xf5, 0xaf, 0x96, 0x12, 0xe4, - 0x5f, 0xb9, 0x6b, 0x50, 0x1f, 0xeb, 0x1a, 0x98, 0x42, 0xaa, 0x61, 0x0c, 0x29, 0xeb, 0x91, 0xba, - 0x03, 0x6b, 0x8b, 0xd6, 0xb7, 0xf3, 0x2d, 0x58, 0xa2, 0x6e, 0x7a, 0x7a, 0xc0, 0xf7, 0x8c, 0xad, - 0x77, 0xd9, 0x1e, 0x11, 0xac, 0x7f, 0xe6, 0xe7, 0x9c, 0x26, 0xe2, 0xf2, 0xe7, 0xdc, 0xb4, 0xe9, - 0xc6, 0x73, 0xee, 0xb3, 0x69, 0xe7, 0xdc, 0xfb, 0xfa, 0x39, 0xb7, 0x3d, 0x4d, 0x65, 0x31, 0x69, - 0xfc, 0x61, 0x4e, 0x75, 0x30, 0x0c, 0x8c, 0xec, 0x8e, 0xe0, 0xa7, 0x0e, 0xe1, 0x34, 0x3f, 0x1a, - 0x70, 0xa5, 0x4d, 0xbb, 0xe5, 0xa7, 0xb6, 0x22, 0x31, 0xbf, 0x0d, 0xdc, 0x94, 0x4a, 0x26, 0xdc, - 0x93, 0x1e, 0xbf, 0xcc, 0x88, 0x52, 0x58, 0x0f, 0xdd, 0x87, 0xb6, 0xda, 0xaa, 0x5c, 0x98, 0x23, - 0xa2, 0x45, 0x7a, 0xc3, 0xa6, 0x1c, 0xcf, 0x05, 0x0b, 0x38, 0x5a, 0xc8, 0x2c, 0x94, 0x42, 0x26, - 0x0f, 0xb2, 0x7a, 0x29, 0xc8, 0x58, 0xc5, 0xc2, 0xfd, 0x46, 0x84, 0x41, 0xfe, 0x3f, 0x8a, 0x9f, - 0xc5, 0x62, 0xfc, 0xe8, 0xb1, 0xdc, 0x2c, 0xc5, 0xb2, 0xf5, 0xe5, 0x1c, 0xbc, 0xa9, 0x7c, 0x5b, - 0x85, 0xd3, 0xac, 0x0a, 0xc4, 0x72, 0x1c, 0xcf, 0x99, 0xe2, 0x58, 0xa4, 0x69, 0x6e, 0x5a, 0x99, - 0x85, 0xd5, 0x6f, 0x7e, 0x2f, 0x63, 0xa6, 0x9a, 0x97, 0xf7, 0xb2, 0x1d, 0x58, 0x56, 0xc6, 0xe7, - 0x63, 0x75, 0x3e, 0xd6, 0x92, 0xb4, 0x63, 0xc6, 0xb2, 0x05, 0x4b, 0x7d, 0xb6, 0x89, 0xac, 0x14, - 0xe4, 0x46, 0x6b, 0xda, 0x4d, 0x46, 0x60, 0x65, 0xdf, 0xf4, 0x3a, 0x71, 0x71, 0x5a, 0x9d, 0xf8, - 0x39, 0xbc, 0xad, 0x19, 0x70, 0xfc, 0x62, 0xff, 0x01, 0x2c, 0xab, 0xa5, 0x07, 0x7e, 0x6e, 0xbf, - 0xb6, 0xaa, 0xd8, 0x0a, 0xf3, 0x44, 0x4b, 0xa4, 0x45, 0x46, 0x14, 0xeb, 0x77, 0xf9, 0xa1, 0x23, - 0xf9, 0x5e, 0x61, 0xe2, 0xf7, 0xcf, 0x6d, 0x7c, 0x92, 0xf9, 0xc1, 0xd7, 0xbb, 0x55, 0x85, 0x33, - 0x45, 0x62, 0x93, 0xa8, 0x4c, 0xb9, 0xc3, 0x2e, 0xe5, 0x8e, 0x87, 0x5a, 0x20, 0x4f, 0x9d, 0x6f, - 0x4c, 0x1e, 0xce, 0xb4, 0xe4, 0xf1, 0x50, 0x4f, 0x1e, 0xef, 0x96, 0x4c, 0xae, 0xa9, 0x33, 0x55, - 0xc9, 0xbf, 0xce, 0xcf, 0x94, 0x7c, 0xc6, 0xcc, 0x8a, 0xe4, 0x0b, 0x5b, 0xfd, 0xcb, 0x5a, 0xc9, - 0xe3, 0x8e, 0xe2, 0x1e, 0x7e, 0x99, 0xf4, 0x5c, 0xfa, 0xf5, 0x02, 0x43, 0xbb, 0xb0, 0x10, 0xc6, - 0x3d, 0x11, 0xb6, 0xab, 0x77, 0xaf, 0x94, 0x8c, 0xcd, 0x50, 0xda, 0x9c, 0xc1, 0xfa, 0x63, 0xde, - 0x59, 0x56, 0xb5, 0xc8, 0x33, 0x37, 0x1d, 0xce, 0x04, 0xfc, 0x58, 0xe5, 0x31, 0x67, 0xa8, 0x3c, - 0x36, 0xa1, 0x41, 0xf0, 0xd0, 0x4d, 0x87, 0x32, 0xe3, 0xc8, 0x3f, 0xeb, 0x37, 0x63, 0x5d, 0x3b, - 0x86, 0x73, 0x86, 0xe5, 0xde, 0x45, 0xd0, 0xb2, 0x03, 0xfb, 0x46, 0x15, 0x2a, 0x3d, 0xe6, 0x3e, - 0x29, 0xc5, 0xdc, 0x7d, 0xe3, 0x8d, 0xa0, 0x62, 0xb6, 0x31, 0xe2, 0x3e, 0x9f, 0x16, 0x71, 0xf7, - 0xf5, 0x88, 0xb3, 0xca, 0xd7, 0xd2, 0xa2, 0x01, 0xc7, 0xe3, 0xed, 0x23, 0xb8, 0x26, 0xb0, 0x1d, - 0x61, 0x4a, 0x7c, 0x2f, 0x1d, 0x7b, 0xbb, 0xb8, 0x0d, 0x8b, 0xa1, 0x18, 0x92, 0x06, 0x5e, 0x53, - 0x0a, 0xe4, 0x0c, 0x5b, 0x8d, 0xdf, 0xfd, 0x07, 0xd2, 0x1e, 0x73, 0x8e, 0x31, 0x39, 0xf3, 0x3d, - 0x66, 0x93, 0x75, 0xf6, 0x89, 0x89, 0x7c, 0x3d, 0x79, 0x8a, 0x29, 0xaa, 0xde, 0xa5, 0xce, 0x8e, - 0x66, 0x32, 0xe3, 0x03, 0xcd, 0x73, 0x58, 0xca, 0x5f, 0x5a, 0x26, 0x89, 0xba, 0xae, 0x8b, 0x32, - 0x3f, 0xce, 0x3c, 0x83, 0xe5, 0xe2, 0x9b, 0x07, 0xda, 0x36, 0x4c, 0xd2, 0x9e, 0x43, 0x3a, 0x9b, - 0x5d, 0xf1, 0xac, 0xd6, 0x55, 0xcf, 0x6a, 0xdd, 0x83, 0x30, 0xa1, 0xe7, 0xe8, 0x15, 0x5c, 0x31, - 0x3c, 0x47, 0xa0, 0x5d, 0x83, 0x40, 0xd3, 0x83, 0x45, 0xa5, 0xdc, 0xe7, 0xb0, 0x59, 0x9a, 0x35, - 0xcc, 0x68, 0x2f, 0xfe, 0x59, 0x34, 0x69, 0xed, 0x55, 0xc2, 0x28, 0x58, 0xd3, 0x7b, 0xea, 0xe8, - 0x7d, 0x03, 0xe6, 0x0b, 0x34, 0xe1, 0x2b, 0xb5, 0x7e, 0x01, 0xab, 0xfa, 0x53, 0x04, 0xb2, 0x0c, - 0x1a, 0x4a, 0xaf, 0x21, 0x9d, 0x5b, 0x13, 0x78, 0xca, 0x75, 0xf2, 0x72, 0xb1, 0x5f, 0x3f, 0xc9, - 0x30, 0x37, 0x2f, 0xd6, 0xe5, 0x47, 0x2f, 0x60, 0x55, 0x6f, 0xdf, 0x96, 0x20, 0x1b, 0x7b, 0xbb, - 0x95, 0x06, 0xf8, 0x08, 0x56, 0xb4, 0x1e, 0x22, 0xda, 0xa9, 0xee, 0x66, 0x4e, 0x93, 0xe5, 0xc0, - 0x15, 0x43, 0x3f, 0x72, 0xd2, 0x9a, 0xef, 0x5c, 0xaa, 0x75, 0x5a, 0x04, 0xcb, 0x9b, 0x5a, 0x15, - 0x60, 0x8b, 0xbd, 0xcd, 0x8b, 0x80, 0x2d, 0x34, 0xc8, 0x2e, 0x0f, 0xb6, 0xb2, 0x15, 0xa8, 0xed, - 0x13, 0xf3, 0xc7, 0xca, 0x7d, 0x2a, 0x14, 0x12, 0x95, 0x70, 0x9f, 0x8d, 0x1c, 0x89, 0x25, 0xce, - 0x52, 0x36, 0x30, 0x1c, 0x9e, 0x95, 0x92, 0x7e, 0x02, 0x68, 0x3c, 0x05, 0xa3, 0x9b, 0x53, 0x0e, - 0x04, 0x25, 0xf5, 0xbd, 0xcb, 0x1c, 0x1c, 0x2c, 0xbc, 0xf4, 0x1e, 0x43, 0x85, 0x0d, 0xb4, 0x56, - 0x54, 0x29, 0xbc, 0x26, 0x75, 0x79, 0x12, 0xd8, 0x30, 0xf5, 0x30, 0xd0, 0x24, 0x09, 0xfa, 0x7a, - 0xba, 0x53, 0x39, 0x75, 0x8d, 0x9f, 0xc1, 0x8a, 0x76, 0x83, 0x2c, 0xb9, 0xa0, 0xa9, 0xe1, 0xd0, - 0xd9, 0xad, 0x66, 0xd1, 0x85, 0x3b, 0x70, 0xc5, 0x74, 0x3d, 0xbd, 0xb0, 0x4f, 0x4e, 0xbd, 0xb6, - 0x7f, 0x08, 0x30, 0xba, 0xdc, 0xa1, 0xb7, 0x4d, 0x85, 0xf7, 0xe8, 0xd6, 0x57, 0xe9, 0x41, 0x1f, - 0x43, 0xab, 0x70, 0x53, 0x99, 0x04, 0xef, 0x86, 0x49, 0xc3, 0x78, 0x4a, 0xeb, 0xc1, 0x9b, 0x7a, - 0x1d, 0xee, 0x47, 0x83, 0xe9, 0x6b, 0xef, 0x5e, 0xee, 0xde, 0x80, 0x7e, 0x08, 0x1b, 0xa6, 0x8b, - 0x53, 0xc9, 0x59, 0x26, 0xdc, 0xad, 0x26, 0x25, 0x51, 0xed, 0x56, 0x50, 0x72, 0x0a, 0xd3, 0x8d, - 0xa1, 0x52, 0x96, 0x0d, 0x6f, 0x8c, 0x15, 0xf3, 0xc8, 0x68, 0xc7, 0xb1, 0x62, 0xbf, 0x52, 0xe6, - 0x11, 0xc0, 0xa8, 0x8c, 0x9a, 0x64, 0xd2, 0x77, 0x35, 0x3d, 0x15, 0xa5, 0xd7, 0x49, 0x83, 0x8b, - 0xbf, 0xf7, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x9a, 0x9e, 0x78, 0x0a, 0xda, 0x23, 0x00, 0x00, + 0xa3, 0xf6, 0x3c, 0x5f, 0xeb, 0x37, 0x26, 0x42, 0xe8, 0xee, 0x4b, 0x6e, 0xb1, 0xca, 0x7c, 0x32, + 0x4b, 0xcc, 0x44, 0x58, 0xbe, 0xbd, 0x70, 0xad, 0x76, 0xbb, 0x69, 0xab, 0x5f, 0x74, 0x1d, 0x96, + 0xb3, 0x14, 0x13, 0xc7, 0x23, 0xd8, 0xa5, 0xb8, 0xd7, 0xae, 0xf3, 0xe1, 0x16, 0xa3, 0xed, 0x0b, + 0x12, 0x9b, 0xac, 0x46, 0x1b, 0x22, 0xab, 0xcb, 0x5f, 0xb6, 0x96, 0xd4, 0xff, 0x19, 0x6e, 0x2f, + 0x8a, 0xb5, 0xb0, 0x6f, 0xf4, 0x18, 0x1a, 0x81, 0x7b, 0x82, 0x83, 0xb4, 0xdd, 0xe4, 0x88, 0xef, + 0x4c, 0x46, 0xfc, 0x82, 0xf3, 0x0a, 0xbc, 0x72, 0x62, 0xe7, 0x43, 0x58, 0xd1, 0x16, 0x62, 0xd8, + 0x99, 0xcd, 0xe2, 0xce, 0x34, 0x0b, 0xa6, 0xef, 0x3c, 0x80, 0x56, 0x41, 0xe6, 0xb4, 0xa9, 0x4b, + 0xc5, 0x5d, 0xfb, 0xb9, 0xca, 0x34, 0xa3, 0xc0, 0x3b, 0xc3, 0x33, 0xca, 0x90, 0xca, 0x0d, 0xe6, + 0x46, 0x6e, 0x60, 0xfd, 0xa6, 0xa6, 0xce, 0xb7, 0x3c, 0x61, 0x64, 0x64, 0x80, 0x67, 0xa2, 0xff, + 0x2e, 0x6c, 0xa4, 0xa7, 0x7e, 0xe2, 0xf8, 0x7d, 0xc7, 0x8f, 0x9c, 0x84, 0xc4, 0x03, 0x7e, 0x6c, + 0x0b, 0x73, 0xae, 0xb3, 0xa1, 0xc3, 0xfe, 0x21, 0x3b, 0x60, 0x39, 0xdd, 0xfa, 0x77, 0x0d, 0x6e, + 0x19, 0xa0, 0x1d, 0x53, 0x97, 0x66, 0xa9, 0x1e, 0x9d, 0xdf, 0x83, 0x46, 0xca, 0xc9, 0x32, 0x3c, + 0x1f, 0x18, 0x1d, 0xa0, 0x6a, 0x7a, 0x57, 0xd0, 0xa4, 0x43, 0x08, 0x41, 0x9d, 0x2f, 0xa1, 0x55, + 0x20, 0x1b, 0xf6, 0xf4, 0x81, 0x1e, 0xa8, 0x37, 0x54, 0x1a, 0x32, 0x68, 0x53, 0x8a, 0x8a, 0x1b, + 0xff, 0xd7, 0xb9, 0xb2, 0xe1, 0xf7, 0x83, 0x38, 0x9a, 0x8d, 0xe1, 0x77, 0x60, 0xad, 0x4f, 0xe2, + 0xd0, 0x19, 0x15, 0x65, 0xd2, 0x07, 0xd8, 0x89, 0x19, 0xee, 0xe7, 0x54, 0x56, 0x11, 0xe5, 0x67, + 0x51, 0xb1, 0x22, 0x52, 0x44, 0x5e, 0x36, 0x3d, 0x82, 0xab, 0xf8, 0x75, 0x12, 0x13, 0xea, 0x9c, + 0xb8, 0xde, 0xa9, 0x1f, 0x0d, 0x1c, 0x3f, 0x74, 0x07, 0x98, 0x6d, 0x2b, 0x7e, 0xed, 0xa7, 0x54, + 0x86, 0xfb, 0x15, 0xc1, 0xf4, 0x1d, 0xc1, 0x73, 0xc8, 0x58, 0x0e, 0xfb, 0x07, 0x8c, 0x81, 0x49, + 0xe8, 0xfb, 0x01, 0x76, 0x58, 0x85, 0xe7, 0x0c, 0x29, 0x4d, 0x1c, 0x2f, 0xf0, 0x71, 0x44, 0x1d, + 0xea, 0x87, 0x38, 0xce, 0x28, 0xcf, 0x08, 0x75, 0xfb, 0x0a, 0x63, 0x3a, 0x3e, 0x8f, 0xbc, 0x67, + 0x94, 0x26, 0xfb, 0x9c, 0xe3, 0x33, 0xc1, 0x60, 0xf0, 0x0d, 0x6e, 0xbd, 0xff, 0xdd, 0x37, 0xaa, + 0xa6, 0xcf, 0xc6, 0x37, 0x0a, 0xda, 0x4c, 0xbe, 0xf1, 0x8b, 0xda, 0x78, 0x56, 0x60, 0xa9, 0x73, + 0x26, 0xce, 0xb1, 0x09, 0x75, 0xb6, 0xd5, 0x2c, 0x0e, 0xe7, 0x59, 0x6e, 0xe2, 0x3f, 0xd6, 0x1f, + 0x17, 0xca, 0x10, 0xd8, 0x46, 0x66, 0xc9, 0xac, 0x12, 0x13, 0x8e, 0xce, 0x44, 0xf6, 0x5e, 0xb2, + 0xf9, 0x37, 0xab, 0xde, 0x4f, 0xb8, 0x46, 0xad, 0x7a, 0x17, 0x24, 0x55, 0xbd, 0x4f, 0xf7, 0xd5, + 0x1b, 0xb0, 0x22, 0xa5, 0x50, 0x97, 0x0c, 0xb0, 0xf0, 0xcd, 0x25, 0x7b, 0x59, 0x10, 0x3f, 0xe3, + 0x34, 0xf4, 0x3e, 0x20, 0xdd, 0x93, 0xb9, 0xb8, 0x3a, 0xe7, 0x5c, 0x3f, 0x29, 0xf8, 0x2f, 0x17, + 0xf9, 0x2d, 0xd8, 0xd2, 0xb9, 0xbd, 0x21, 0xf6, 0x4e, 0xd3, 0x2c, 0x94, 0x27, 0xd5, 0x66, 0x71, + 0xc6, 0xbe, 0x1c, 0x43, 0x4f, 0xf2, 0x23, 0x6a, 0x91, 0x7b, 0x61, 0xd7, 0xe8, 0x85, 0x9a, 0x8d, + 0x4d, 0xe7, 0x14, 0xba, 0x0b, 0xc8, 0x8b, 0xc3, 0x84, 0x25, 0x48, 0x3f, 0x8e, 0x9c, 0x10, 0xd3, + 0x61, 0xdc, 0x6b, 0x2f, 0x71, 0xcd, 0x6f, 0x14, 0x46, 0x8e, 0xf8, 0x00, 0xba, 0x03, 0xeb, 0x5e, + 0x1c, 0x79, 0x19, 0x61, 0x67, 0xbb, 0x13, 0xf8, 0xa1, 0x4f, 0xdb, 0xc0, 0x83, 0x6b, 0x6d, 0x44, + 0x7f, 0xc1, 0xc8, 0xff, 0xcf, 0x21, 0xf6, 0xcb, 0x9a, 0xaa, 0x3d, 0xf5, 0x85, 0xe8, 0x81, 0xb8, + 0x0d, 0x4b, 0x72, 0x2f, 0xfc, 0x9e, 0x94, 0xdb, 0x14, 0x84, 0xc3, 0x9e, 0xa8, 0x16, 0x92, 0xc0, + 0xf7, 0x5c, 0x29, 0x5e, 0xfd, 0xa2, 0x9b, 0xb0, 0xea, 0xa7, 0x8e, 0x1f, 0x79, 0x04, 0x87, 0x38, + 0xa2, 0x6e, 0xc0, 0x37, 0xba, 0x69, 0xaf, 0xf8, 0xe9, 0xe1, 0x88, 0xc8, 0x2e, 0x1c, 0x46, 0x0c, + 0x2a, 0xca, 0x66, 0xe0, 0xb6, 0x53, 0x5d, 0x74, 0x07, 0xd6, 0xe4, 0x2a, 0x1c, 0x75, 0x47, 0x15, + 0x4e, 0xba, 0x2a, 0xc9, 0x8f, 0x05, 0xd5, 0xfa, 0x4f, 0x0d, 0x76, 0xaa, 0xc1, 0xeb, 0x66, 0xbc, + 0x0a, 0x52, 0x85, 0x93, 0x91, 0x40, 0xda, 0x51, 0x1a, 0xf6, 0x25, 0x09, 0xd8, 0x2e, 0x61, 0x42, + 0x62, 0x95, 0xe1, 0xc5, 0x0f, 0xea, 0x40, 0x33, 0x3f, 0x6f, 0xe7, 0xf9, 0xfe, 0xe7, 0xff, 0xe3, + 0x81, 0xb4, 0x60, 0x08, 0xa4, 0x4d, 0xa8, 0xb3, 0xe4, 0xa7, 0xc2, 0x42, 0xfc, 0x98, 0x16, 0xd8, + 0x30, 0x2e, 0xf0, 0xab, 0xbc, 0xcc, 0x50, 0x2e, 0x9e, 0xd2, 0x98, 0xe0, 0x99, 0x66, 0x93, 0xb9, + 0x42, 0x36, 0x59, 0x87, 0x79, 0x66, 0x2d, 0x61, 0x7d, 0xf6, 0xc9, 0xea, 0x5f, 0x2d, 0x25, 0xc8, + 0xbf, 0x72, 0xd7, 0xa0, 0x3e, 0xd6, 0x35, 0x30, 0x85, 0x54, 0xc3, 0x18, 0x52, 0xd6, 0x23, 0x75, + 0x07, 0xd6, 0x16, 0xad, 0x6f, 0xe7, 0xdb, 0xb0, 0x44, 0xdd, 0xf4, 0xf4, 0x80, 0xef, 0x19, 0x5b, + 0xef, 0xb2, 0x3d, 0x22, 0x58, 0xff, 0xcc, 0xcf, 0x39, 0x4d, 0xc4, 0xe5, 0xcf, 0xb9, 0x69, 0xd3, + 0x8d, 0xe7, 0xdc, 0xe7, 0xd3, 0xce, 0xb9, 0x0f, 0xf4, 0x73, 0xee, 0xda, 0x34, 0x95, 0xc5, 0xa4, + 0xf1, 0xfb, 0x39, 0xd5, 0xc1, 0x30, 0x30, 0xb2, 0x3b, 0x82, 0x9f, 0x3a, 0x84, 0xd3, 0xfc, 0x68, + 0xc0, 0x95, 0x36, 0xed, 0x96, 0x9f, 0xda, 0x8a, 0xc4, 0xfc, 0x36, 0x70, 0x53, 0x2a, 0x99, 0x70, + 0x4f, 0x7a, 0xfc, 0x32, 0x23, 0x4a, 0x61, 0x3d, 0x74, 0x1f, 0xda, 0x6a, 0xab, 0x72, 0x61, 0x8e, + 0x88, 0x16, 0xe9, 0x0d, 0x5b, 0x72, 0x3c, 0x17, 0x2c, 0xe0, 0x68, 0x21, 0xb3, 0x50, 0x0a, 0x99, + 0x3c, 0xc8, 0xea, 0xa5, 0x20, 0x63, 0x15, 0x0b, 0xf7, 0x1b, 0x11, 0x06, 0xf9, 0xff, 0x28, 0x7e, + 0x16, 0x8b, 0xf1, 0xa3, 0xc7, 0x72, 0xb3, 0x14, 0xcb, 0xd6, 0x57, 0x73, 0xf0, 0x96, 0xf2, 0x6d, + 0x15, 0x4e, 0xb3, 0x2a, 0x10, 0xcb, 0x71, 0x3c, 0x67, 0x8a, 0x63, 0x91, 0xa6, 0xb9, 0x69, 0x65, + 0x16, 0x56, 0xbf, 0xf9, 0xbd, 0x8c, 0x99, 0x6a, 0x5e, 0xde, 0xcb, 0xae, 0xc3, 0xb2, 0x32, 0x3e, + 0x1f, 0xab, 0xf3, 0xb1, 0x96, 0xa4, 0x1d, 0x33, 0x96, 0x6d, 0x58, 0xea, 0xb3, 0x4d, 0x64, 0xa5, + 0x20, 0x37, 0x5a, 0xd3, 0x6e, 0x32, 0x02, 0x2b, 0xfb, 0xa6, 0xd7, 0x89, 0x8b, 0x53, 0xea, 0x44, + 0xb4, 0x07, 0x6f, 0xaa, 0x85, 0xe9, 0xad, 0x3e, 0x61, 0xeb, 0x0d, 0x39, 0x78, 0x58, 0xec, 0xf8, + 0x7d, 0x01, 0xef, 0x68, 0x46, 0x1f, 0x6f, 0x06, 0x7c, 0x08, 0xcb, 0x4a, 0x6a, 0xe0, 0xe7, 0x36, + 0x6f, 0xab, 0x2a, 0xaf, 0x30, 0x4f, 0xb4, 0x51, 0x5a, 0x64, 0x44, 0xb1, 0x7e, 0x9b, 0x1f, 0x54, + 0x92, 0xef, 0x15, 0x26, 0x7e, 0xff, 0xdc, 0xc6, 0x27, 0x99, 0x1f, 0x7c, 0xbd, 0xdb, 0x5b, 0x38, + 0x87, 0x24, 0x36, 0x89, 0xca, 0x94, 0x6f, 0xec, 0x52, 0xbe, 0x79, 0xa8, 0x05, 0xff, 0xd4, 0xf9, + 0xc6, 0x84, 0xe3, 0x4c, 0x4b, 0x38, 0x0f, 0xf5, 0x84, 0xf3, 0x5e, 0xc9, 0xe4, 0x9a, 0x3a, 0x53, + 0x65, 0xfd, 0xab, 0xfc, 0x1c, 0xca, 0x67, 0xcc, 0xac, 0xb0, 0xbe, 0xb0, 0xd5, 0xff, 0x56, 0x2b, + 0x79, 0xdc, 0x51, 0xdc, 0xc3, 0x2f, 0x93, 0x9e, 0x4b, 0xbf, 0x5e, 0x60, 0x68, 0x07, 0x16, 0xc2, + 0xb8, 0x27, 0x42, 0x7d, 0x75, 0x6f, 0xa3, 0x64, 0x6c, 0x86, 0xd2, 0xe6, 0x0c, 0xd6, 0x1f, 0xf2, + 0x6e, 0xb4, 0xaa, 0x5f, 0x9e, 0xb9, 0xe9, 0x70, 0x26, 0xe0, 0xc7, 0xaa, 0x95, 0x39, 0x43, 0xb5, + 0xb2, 0x05, 0x0d, 0x82, 0x87, 0x6e, 0x3a, 0x94, 0x59, 0x4a, 0xfe, 0x59, 0xbf, 0x1e, 0xeb, 0xf4, + 0x31, 0x9c, 0x33, 0x2c, 0x11, 0x2f, 0x82, 0x96, 0x1d, 0xf2, 0x37, 0xab, 0x50, 0xe9, 0x31, 0xf7, + 0x69, 0x29, 0xe6, 0xee, 0x1b, 0x6f, 0x11, 0x15, 0xb3, 0x8d, 0x11, 0xf7, 0xc5, 0xb4, 0x88, 0xbb, + 0xaf, 0x47, 0x9c, 0x55, 0xbe, 0xca, 0x16, 0x0d, 0x38, 0x1e, 0x6f, 0x1f, 0xc3, 0x55, 0x81, 0xed, + 0x08, 0x53, 0xe2, 0x7b, 0xe9, 0xd8, 0x7b, 0xc7, 0x1d, 0x58, 0x0c, 0xc5, 0x90, 0x34, 0xf0, 0x9a, + 0x52, 0x20, 0x67, 0xd8, 0x6a, 0x7c, 0xef, 0x1f, 0x48, 0x7b, 0x00, 0x3a, 0xc6, 0xe4, 0xcc, 0xf7, + 0x98, 0x4d, 0xd6, 0xd9, 0x27, 0x26, 0xf2, 0xc5, 0xe5, 0x29, 0xa6, 0xa8, 0x7a, 0x97, 0x3a, 0xd7, + 0x35, 0x93, 0x19, 0x1f, 0x75, 0x9e, 0xc3, 0x52, 0xfe, 0x3a, 0x33, 0x49, 0xd4, 0x0d, 0x5d, 0x94, + 0xf9, 0x41, 0xe7, 0x19, 0x2c, 0x17, 0xdf, 0x49, 0xd0, 0x35, 0xc3, 0x24, 0xed, 0x09, 0xa5, 0xb3, + 0xd5, 0x15, 0x4f, 0x71, 0x5d, 0xf5, 0x14, 0xd7, 0x3d, 0x08, 0x13, 0x7a, 0x8e, 0x5e, 0xc1, 0x86, + 0xe1, 0x09, 0x03, 0xed, 0x18, 0x04, 0x9a, 0x1e, 0x39, 0x2a, 0xe5, 0x3e, 0x87, 0xad, 0xd2, 0xac, + 0x61, 0x46, 0x7b, 0xf1, 0x4f, 0xa3, 0x49, 0x6b, 0xaf, 0x12, 0x46, 0xc1, 0x9a, 0xde, 0x87, 0x47, + 0x1f, 0x18, 0x30, 0x5f, 0xa0, 0x71, 0x5f, 0xa9, 0xf5, 0x4b, 0x58, 0xd5, 0x9f, 0x2f, 0x90, 0x65, + 0xd0, 0x50, 0x7a, 0x41, 0xe9, 0xdc, 0x9e, 0xc0, 0x53, 0xae, 0xad, 0x97, 0x8b, 0x3d, 0xfe, 0x49, + 0x86, 0xb9, 0x75, 0xb1, 0x97, 0x01, 0xf4, 0x02, 0x56, 0xf5, 0x96, 0x6f, 0x09, 0xb2, 0xb1, 0x1f, + 0x5c, 0x69, 0x80, 0x8f, 0x61, 0x45, 0xeb, 0x3b, 0xa2, 0xeb, 0xd5, 0x1d, 0xd0, 0x69, 0xb2, 0x1c, + 0xd8, 0x30, 0xf4, 0x30, 0x27, 0xad, 0xf9, 0xee, 0xa5, 0xda, 0xad, 0x45, 0xb0, 0xbc, 0x11, 0x56, + 0x01, 0xb6, 0xd8, 0x0f, 0xbd, 0x08, 0xd8, 0x42, 0x53, 0xed, 0xf2, 0x60, 0x2b, 0xdb, 0x87, 0xda, + 0x3e, 0x31, 0x7f, 0xac, 0xdc, 0xa7, 0x42, 0x21, 0x51, 0x09, 0xf7, 0xd9, 0xc8, 0x91, 0x58, 0xe2, + 0x2c, 0x65, 0x03, 0xc3, 0xe1, 0x59, 0x29, 0xe9, 0xc7, 0x80, 0xc6, 0x53, 0x30, 0xba, 0x35, 0xe5, + 0x40, 0x50, 0x52, 0xdf, 0xbf, 0xcc, 0xc1, 0xc1, 0xc2, 0x4b, 0xef, 0x4b, 0x54, 0xd8, 0x40, 0x6b, + 0x5f, 0x95, 0xc2, 0x6b, 0x52, 0x67, 0x28, 0x81, 0x4d, 0x53, 0xdf, 0x03, 0x4d, 0x92, 0xa0, 0xaf, + 0xa7, 0x3b, 0x95, 0x53, 0xd7, 0xf8, 0x39, 0xac, 0x68, 0xb7, 0xce, 0x92, 0x0b, 0x9a, 0x9a, 0x14, + 0x9d, 0x9d, 0x6a, 0x16, 0x5d, 0xb8, 0x03, 0x1b, 0xa6, 0x2b, 0xed, 0x85, 0x7d, 0x72, 0xea, 0x55, + 0xff, 0x23, 0x80, 0xd1, 0x85, 0x10, 0xbd, 0x63, 0x2a, 0xbc, 0x47, 0x37, 0xc5, 0x4a, 0x0f, 0xfa, + 0x04, 0x5a, 0x85, 0x9b, 0xca, 0x24, 0x78, 0x37, 0x4d, 0x1a, 0xc6, 0x53, 0x5a, 0x0f, 0xde, 0xd2, + 0xeb, 0x70, 0x3f, 0x1a, 0x4c, 0x5f, 0x7b, 0xf7, 0x72, 0xf7, 0x06, 0xf4, 0x03, 0xd8, 0x34, 0x5d, + 0x9c, 0x4a, 0xce, 0x32, 0xe1, 0x6e, 0x35, 0x29, 0x89, 0x6a, 0xb7, 0x82, 0x92, 0x53, 0x98, 0x6e, + 0x0c, 0x95, 0xb2, 0x6c, 0x78, 0x63, 0xac, 0x98, 0x47, 0x46, 0x3b, 0x8e, 0x15, 0xfb, 0x95, 0x32, + 0x8f, 0x00, 0x46, 0x65, 0xd4, 0x24, 0x93, 0xbe, 0xa7, 0xe9, 0xa9, 0x28, 0xbd, 0x4e, 0x1a, 0x5c, + 0xfc, 0xbd, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x39, 0x31, 0x81, 0xb3, 0x0e, 0x24, 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 cf25b90f6b..fefa2a1755 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 @@ -210,6 +210,7 @@ message EngineReplicaAddRequest { int64 current_size = 5; bool fast_sync = 6; int32 file_sync_http_client_timeout = 7; + string replica_instance_name = 8; } message EngineReplicaListProxyResponse {