Skip to content
Snippets Groups Projects
Commit ae1df23c authored by Patrick's avatar Patrick
Browse files

add comment and adjust service_discovery's critical area

parent 7ac57ce9
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
registry/zookeeper/service_discovery.go
+ 39
− 4
View file @ ae1df23c
...@@ -72,6 +72,7 @@ type zookeeperServiceDiscovery struct { ...@@ -72,6 +72,7 @@ type zookeeperServiceDiscovery struct {
listenNames []string listenNames []string
} }
// newZookeeperServiceDiscovery the constructor of newZookeeperServiceDiscovery
func newZookeeperServiceDiscovery(name string) (registry.ServiceDiscovery, error) { func newZookeeperServiceDiscovery(name string) (registry.ServiceDiscovery, error) {
instance, ok := instanceMap[name] instance, ok := instanceMap[name]
if ok { if ok {
...@@ -115,66 +116,85 @@ func newZookeeperServiceDiscovery(name string) (registry.ServiceDiscovery, error ...@@ -115,66 +116,85 @@ func newZookeeperServiceDiscovery(name string) (registry.ServiceDiscovery, error
return zksd, nil return zksd, nil
} }
// nolint
func (zksd *zookeeperServiceDiscovery) ZkClient() *zookeeper.ZookeeperClient { func (zksd *zookeeperServiceDiscovery) ZkClient() *zookeeper.ZookeeperClient {
return zksd.client return zksd.client
} }
// nolint
func (zksd *zookeeperServiceDiscovery) SetZkClient(client *zookeeper.ZookeeperClient) { func (zksd *zookeeperServiceDiscovery) SetZkClient(client *zookeeper.ZookeeperClient) {
zksd.client = client zksd.client = client
} }
// nolint
func (zksd *zookeeperServiceDiscovery) ZkClientLock() *sync.Mutex { func (zksd *zookeeperServiceDiscovery) ZkClientLock() *sync.Mutex {
return &zksd.cltLock return &zksd.cltLock
} }
// nolint
func (zksd *zookeeperServiceDiscovery) WaitGroup() *sync.WaitGroup { func (zksd *zookeeperServiceDiscovery) WaitGroup() *sync.WaitGroup {
return &zksd.wg return &zksd.wg
} }
// nolint
func (zksd *zookeeperServiceDiscovery) Done() chan struct{} { func (zksd *zookeeperServiceDiscovery) Done() chan struct{} {
return zksd.done return zksd.done
} }
// RestartCallBack when zookeeper connection reconnect this function will be invoked.
// try to re-register service, and listen services
func (zksd *zookeeperServiceDiscovery) RestartCallBack() bool { func (zksd *zookeeperServiceDiscovery) RestartCallBack() bool {
zksd.csd.ReRegisterService() zksd.csd.ReRegisterServices()
zksd.listenLock.Lock()
defer zksd.listenLock.Unlock()
for _, name := range zksd.listenNames { for _, name := range zksd.listenNames {
zksd.csd.ListenServiceEvent(name, zksd) zksd.csd.ListenServiceEvent(name, zksd)
} }
return true return true
} }
// nolint
func (zksd *zookeeperServiceDiscovery) GetUrl() common.URL { func (zksd *zookeeperServiceDiscovery) GetUrl() common.URL {
return *zksd.url return *zksd.url
} }
// nolint
func (zksd *zookeeperServiceDiscovery) String() string { func (zksd *zookeeperServiceDiscovery) String() string {
return fmt.Sprintf("zookeeper-service-discovery[%s]", zksd.url) return fmt.Sprintf("zookeeper-service-discovery[%s]", zksd.url)
} }
// Close client be closed
func (zksd *zookeeperServiceDiscovery) Destroy() error { func (zksd *zookeeperServiceDiscovery) Destroy() error {
zksd.client.Close() zksd.client.Close()
return nil return nil
} }
// Register will register service in zookeeper, instance convert to curator's service instance
// which define in curator-x-discovery.
func (zksd *zookeeperServiceDiscovery) Register(instance registry.ServiceInstance) error { func (zksd *zookeeperServiceDiscovery) Register(instance registry.ServiceInstance) error {
cris := zksd.toCuratorInstance(instance) cris := zksd.toCuratorInstance(instance)
return zksd.csd.RegisterService(cris) return zksd.csd.RegisterService(cris)
} }
// Register will update service in zookeeper, instance convert to curator's service instance
// which define in curator-x-discovery, please refer to https://github.com/apache/curator.
func (zksd *zookeeperServiceDiscovery) Update(instance registry.ServiceInstance) error { func (zksd *zookeeperServiceDiscovery) Update(instance registry.ServiceInstance) error {
cris := zksd.toCuratorInstance(instance) cris := zksd.toCuratorInstance(instance)
return zksd.csd.UpdateService(cris) return zksd.csd.UpdateService(cris)
} }
// Unregister will unregister the instance in zookeeper
func (zksd *zookeeperServiceDiscovery) Unregister(instance registry.ServiceInstance) error { func (zksd *zookeeperServiceDiscovery) Unregister(instance registry.ServiceInstance) error {
cris := zksd.toCuratorInstance(instance) cris := zksd.toCuratorInstance(instance)
return zksd.csd.UnregisterService(cris) return zksd.csd.UnregisterService(cris)
} }
// GetDefaultPageSize will return the constant registry.DefaultPageSize
func (zksd *zookeeperServiceDiscovery) GetDefaultPageSize() int { func (zksd *zookeeperServiceDiscovery) GetDefaultPageSize() int {
return registry.DefaultPageSize return registry.DefaultPageSize
} }
// GetServices will return the all services in zookeeper
func (zksd *zookeeperServiceDiscovery) GetServices() *gxset.HashSet { func (zksd *zookeeperServiceDiscovery) GetServices() *gxset.HashSet {
services, err := zksd.csd.QueryForNames() services, err := zksd.csd.QueryForNames()
res := gxset.NewSet() res := gxset.NewSet()
...@@ -188,6 +208,7 @@ func (zksd *zookeeperServiceDiscovery) GetServices() *gxset.HashSet { ...@@ -188,6 +208,7 @@ func (zksd *zookeeperServiceDiscovery) GetServices() *gxset.HashSet {
return res return res
} }
// GetInstances will return the instances in a service
func (zksd *zookeeperServiceDiscovery) GetInstances(serviceName string) []registry.ServiceInstance { func (zksd *zookeeperServiceDiscovery) GetInstances(serviceName string) []registry.ServiceInstance {
criss, err := zksd.csd.QueryForInstances(serviceName) criss, err := zksd.csd.QueryForInstances(serviceName)
if err != nil { if err != nil {
...@@ -202,6 +223,7 @@ func (zksd *zookeeperServiceDiscovery) GetInstances(serviceName string) []regist ...@@ -202,6 +223,7 @@ func (zksd *zookeeperServiceDiscovery) GetInstances(serviceName string) []regist
return iss return iss
} }
// GetInstancesByPage will return the instances
func (zksd *zookeeperServiceDiscovery) GetInstancesByPage(serviceName string, offset int, pageSize int) gxpage.Pager { func (zksd *zookeeperServiceDiscovery) GetInstancesByPage(serviceName string, offset int, pageSize int) gxpage.Pager {
all := zksd.GetInstances(serviceName) all := zksd.GetInstances(serviceName)
res := make([]interface{}, 0, pageSize) res := make([]interface{}, 0, pageSize)
...@@ -212,6 +234,10 @@ func (zksd *zookeeperServiceDiscovery) GetInstancesByPage(serviceName string, of ...@@ -212,6 +234,10 @@ func (zksd *zookeeperServiceDiscovery) GetInstancesByPage(serviceName string, of
return gxpage.New(offset, pageSize, res, len(all)) return gxpage.New(offset, pageSize, res, len(all))
} }
// GetHealthyInstancesByPage will return the instance
// In zookeeper, all service instance's is healthy.
// However, the healthy parameter in this method maybe false. So we can not use that API.
// Thus, we must query all instances and then do filter
func (zksd *zookeeperServiceDiscovery) GetHealthyInstancesByPage(serviceName string, offset int, pageSize int, healthy bool) gxpage.Pager { func (zksd *zookeeperServiceDiscovery) GetHealthyInstancesByPage(serviceName string, offset int, pageSize int, healthy bool) gxpage.Pager {
all := zksd.GetInstances(serviceName) all := zksd.GetInstances(serviceName)
res := make([]interface{}, 0, pageSize) res := make([]interface{}, 0, pageSize)
...@@ -231,6 +257,7 @@ func (zksd *zookeeperServiceDiscovery) GetHealthyInstancesByPage(serviceName str ...@@ -231,6 +257,7 @@ func (zksd *zookeeperServiceDiscovery) GetHealthyInstancesByPage(serviceName str
return gxpage.New(offset, pageSize, res, len(all)) return gxpage.New(offset, pageSize, res, len(all))
} }
// GetRequestInstances will return the instances
func (zksd *zookeeperServiceDiscovery) GetRequestInstances(serviceNames []string, offset int, requestedSize int) map[string]gxpage.Pager { func (zksd *zookeeperServiceDiscovery) GetRequestInstances(serviceNames []string, offset int, requestedSize int) map[string]gxpage.Pager {
res := make(map[string]gxpage.Pager, len(serviceNames)) res := make(map[string]gxpage.Pager, len(serviceNames))
for _, name := range serviceNames { for _, name := range serviceNames {
...@@ -239,6 +266,7 @@ func (zksd *zookeeperServiceDiscovery) GetRequestInstances(serviceNames []string ...@@ -239,6 +266,7 @@ func (zksd *zookeeperServiceDiscovery) GetRequestInstances(serviceNames []string
return res return res
} }
// AddListener ListenServiceEvent will add a data listener in service
func (zksd *zookeeperServiceDiscovery) AddListener(listener *registry.ServiceInstancesChangedListener) error { func (zksd *zookeeperServiceDiscovery) AddListener(listener *registry.ServiceInstancesChangedListener) error {
zksd.listenLock.Lock() zksd.listenLock.Lock()
defer zksd.listenLock.Unlock() defer zksd.listenLock.Unlock()
...@@ -251,26 +279,32 @@ func (zksd *zookeeperServiceDiscovery) DispatchEventByServiceName(serviceName st ...@@ -251,26 +279,32 @@ func (zksd *zookeeperServiceDiscovery) DispatchEventByServiceName(serviceName st
return zksd.DispatchEventForInstances(serviceName, zksd.GetInstances(serviceName)) return zksd.DispatchEventForInstances(serviceName, zksd.GetInstances(serviceName))
} }
// DispatchEventForInstances dispatch ServiceInstancesChangedEvent
func (zksd *zookeeperServiceDiscovery) DispatchEventForInstances(serviceName string, instances []registry.ServiceInstance) error { func (zksd *zookeeperServiceDiscovery) DispatchEventForInstances(serviceName string, instances []registry.ServiceInstance) error {
return zksd.DispatchEvent(registry.NewServiceInstancesChangedEvent(serviceName, instances)) return zksd.DispatchEvent(registry.NewServiceInstancesChangedEvent(serviceName, instances))
} }
// nolint
func (zksd *zookeeperServiceDiscovery) DispatchEvent(event *registry.ServiceInstancesChangedEvent) error { func (zksd *zookeeperServiceDiscovery) DispatchEvent(event *registry.ServiceInstancesChangedEvent) error {
extension.GetGlobalDispatcher().Dispatch(event) extension.GetGlobalDispatcher().Dispatch(event)
return nil return nil
} }
// DataChange implement DataListener's DataChange function
// to resolve event to do DispatchEventByServiceName
func (zksd *zookeeperServiceDiscovery) DataChange(eventType remoting.Event) bool { func (zksd *zookeeperServiceDiscovery) DataChange(eventType remoting.Event) bool {
path := strings.TrimPrefix(eventType.Path, zksd.rootPath) path := strings.TrimPrefix(eventType.Path, zksd.rootPath)
path = strings.TrimPrefix(eventType.Path, constant.PATH_SEPARATOR) path = strings.TrimPrefix(eventType.Path, constant.PATH_SEPARATOR)
name := strings.Split(path, constant.PATH_SEPARATOR)[0] // get service name in zk path
err := zksd.DispatchEventByServiceName(name) serviceName := strings.Split(path, constant.PATH_SEPARATOR)[0]
err := zksd.DispatchEventByServiceName(serviceName)
if err != nil { if err != nil {
logger.Errorf("[zkServiceDiscovery] DispatchEventByServiceName{%s} error = err{%v}", name, err) logger.Errorf("[zkServiceDiscovery] DispatchEventByServiceName{%s} error = err{%v}", serviceName, err)
} }
return true return true
} }
// toCuratorInstance convert to curator's service instance
func (zksd *zookeeperServiceDiscovery) toCuratorInstance(instance registry.ServiceInstance) *curator_discovery.ServiceInstance { func (zksd *zookeeperServiceDiscovery) toCuratorInstance(instance registry.ServiceInstance) *curator_discovery.ServiceInstance {
id := instance.GetHost() + ":" + strconv.Itoa(instance.GetPort()) id := instance.GetHost() + ":" + strconv.Itoa(instance.GetPort())
pl := make(map[string]interface{}) pl := make(map[string]interface{})
...@@ -288,6 +322,7 @@ func (zksd *zookeeperServiceDiscovery) toCuratorInstance(instance registry.Servi ...@@ -288,6 +322,7 @@ func (zksd *zookeeperServiceDiscovery) toCuratorInstance(instance registry.Servi
return cuis return cuis
} }
// toZookeeperInstance convert to registry's service instance
func (zksd *zookeeperServiceDiscovery) toZookeeperInstance(cris *curator_discovery.ServiceInstance) registry.ServiceInstance { func (zksd *zookeeperServiceDiscovery) toZookeeperInstance(cris *curator_discovery.ServiceInstance) registry.ServiceInstance {
pl, ok := cris.Payload.(map[string]interface{}) pl, ok := cris.Payload.(map[string]interface{})
if !ok { if !ok {
......
remoting/zookeeper/curator_discovery/service_discovery.go
+ 25
− 11
View file @ ae1df23c
...@@ -35,11 +35,14 @@ import ( ...@@ -35,11 +35,14 @@ import (
"github.com/apache/dubbo-go/remoting/zookeeper" "github.com/apache/dubbo-go/remoting/zookeeper"
) )
// Entry contain a service instance
type Entry struct { type Entry struct {
sync.Mutex sync.Mutex
instance *ServiceInstance instance *ServiceInstance
} }
// ServiceInstance which define in curator-x-discovery, please refer to
// https://github.com/apache/curator/blob/master/curator-x-discovery/src/main/java/org/apache/curator/x/discovery/ServiceDiscovery.java
type ServiceDiscovery struct { type ServiceDiscovery struct {
client *zookeeper.ZookeeperClient client *zookeeper.ZookeeperClient
mutex *sync.Mutex mutex *sync.Mutex
...@@ -48,6 +51,7 @@ type ServiceDiscovery struct { ...@@ -48,6 +51,7 @@ type ServiceDiscovery struct {
listener *zookeeper.ZkEventListener listener *zookeeper.ZkEventListener
} }
// NewServiceDiscovery the constructor of service discovery
func NewServiceDiscovery(client *zookeeper.ZookeeperClient, basePath string) *ServiceDiscovery { func NewServiceDiscovery(client *zookeeper.ZookeeperClient, basePath string) *ServiceDiscovery {
return &ServiceDiscovery{ return &ServiceDiscovery{
client: client, client: client,
...@@ -58,6 +62,7 @@ func NewServiceDiscovery(client *zookeeper.ZookeeperClient, basePath string) *Se ...@@ -58,6 +62,7 @@ func NewServiceDiscovery(client *zookeeper.ZookeeperClient, basePath string) *Se
} }
} }
// registerService register service to zookeeper
func (sd *ServiceDiscovery) registerService(instance *ServiceInstance) error { func (sd *ServiceDiscovery) registerService(instance *ServiceInstance) error {
path := sd.pathForInstance(instance.Name, instance.Id) path := sd.pathForInstance(instance.Name, instance.Id)
data, err := json.Marshal(instance) data, err := json.Marshal(instance)
...@@ -71,6 +76,7 @@ func (sd *ServiceDiscovery) registerService(instance *ServiceInstance) error { ...@@ -71,6 +76,7 @@ func (sd *ServiceDiscovery) registerService(instance *ServiceInstance) error {
return nil return nil
} }
// RegisterService register service to zookeeper, and ensure cache is consistent with zookeeper
func (sd *ServiceDiscovery) RegisterService(instance *ServiceInstance) error { func (sd *ServiceDiscovery) RegisterService(instance *ServiceInstance) error {
value, loaded := sd.services.LoadOrStore(instance.Id, &Entry{}) value, loaded := sd.services.LoadOrStore(instance.Id, &Entry{})
entry, ok := value.(*Entry) entry, ok := value.(*Entry)
...@@ -90,6 +96,7 @@ func (sd *ServiceDiscovery) RegisterService(instance *ServiceInstance) error { ...@@ -90,6 +96,7 @@ func (sd *ServiceDiscovery) RegisterService(instance *ServiceInstance) error {
return nil return nil
} }
// UpdateService update service in zookeeper, and ensure cache is consistent with zookeeper
func (sd *ServiceDiscovery) UpdateService(instance *ServiceInstance) error { func (sd *ServiceDiscovery) UpdateService(instance *ServiceInstance) error {
value, ok := sd.services.Load(instance.Id) value, ok := sd.services.Load(instance.Id)
if !ok { if !ok {
...@@ -114,6 +121,7 @@ func (sd *ServiceDiscovery) UpdateService(instance *ServiceInstance) error { ...@@ -114,6 +121,7 @@ func (sd *ServiceDiscovery) UpdateService(instance *ServiceInstance) error {
return nil return nil
} }
// updateInternalService update service in cache
func (sd *ServiceDiscovery) updateInternalService(name, id string) { func (sd *ServiceDiscovery) updateInternalService(name, id string) {
value, ok := sd.services.Load(id) value, ok := sd.services.Load(id)
if !ok { if !ok {
...@@ -123,46 +131,43 @@ func (sd *ServiceDiscovery) updateInternalService(name, id string) { ...@@ -123,46 +131,43 @@ func (sd *ServiceDiscovery) updateInternalService(name, id string) {
if !ok { if !ok {
return return
} }
entry.Lock()
defer entry.Unlock()
instance, err := sd.QueryForInstance(name, id) instance, err := sd.QueryForInstance(name, id)
if err != nil { if err != nil {
logger.Infof("[zkServiceDiscovery] UpdateInternalService{%s} error = err{%v}", id, err) logger.Infof("[zkServiceDiscovery] UpdateInternalService{%s} error = err{%v}", id, err)
return return
} }
entry.Lock()
entry.instance = instance entry.instance = instance
entry.Unlock()
return return
} }
// UnregisterService un-register service in zookeeper and delete service in cache
func (sd *ServiceDiscovery) UnregisterService(instance *ServiceInstance) error { func (sd *ServiceDiscovery) UnregisterService(instance *ServiceInstance) error {
value, ok := sd.services.Load(instance.Id) _, ok := sd.services.Load(instance.Id)
if !ok { if !ok {
return nil return nil
} }
entry, ok := value.(*Entry)
if !ok {
return perrors.New("[ServiceDiscovery] services value not entry")
}
entry.Lock()
entry.Unlock()
sd.services.Delete(instance.Id) sd.services.Delete(instance.Id)
return sd.unregisterService(instance) return sd.unregisterService(instance)
} }
// unregisterService un-register service in zookeeper
func (sd *ServiceDiscovery) unregisterService(instance *ServiceInstance) error { func (sd *ServiceDiscovery) unregisterService(instance *ServiceInstance) error {
path := sd.pathForInstance(instance.Name, instance.Id) path := sd.pathForInstance(instance.Name, instance.Id)
return sd.client.Delete(path) return sd.client.Delete(path)
} }
func (sd *ServiceDiscovery) ReRegisterService() { // ReRegisterServices re-register all cache services to zookeeper
func (sd *ServiceDiscovery) ReRegisterServices() {
sd.services.Range(func(key, value interface{}) bool { sd.services.Range(func(key, value interface{}) bool {
entry, ok := value.(*Entry) entry, ok := value.(*Entry)
if !ok { if !ok {
return true return true
} }
entry.Lock() entry.Lock()
defer entry.Unlock()
instance := entry.instance instance := entry.instance
entry.Unlock()
err := sd.registerService(instance) err := sd.registerService(instance)
if err != nil { if err != nil {
logger.Errorf("[zkServiceDiscovery] registerService{%s} error = err{%v}", instance.Id, perrors.WithStack(err)) logger.Errorf("[zkServiceDiscovery] registerService{%s} error = err{%v}", instance.Id, perrors.WithStack(err))
...@@ -173,6 +178,7 @@ func (sd *ServiceDiscovery) ReRegisterService() { ...@@ -173,6 +178,7 @@ func (sd *ServiceDiscovery) ReRegisterService() {
}) })
} }
// QueryForInstances query instances in zookeeper by name
func (sd *ServiceDiscovery) QueryForInstances(name string) ([]*ServiceInstance, error) { func (sd *ServiceDiscovery) QueryForInstances(name string) ([]*ServiceInstance, error) {
ids, err := sd.client.GetChildren(sd.pathForName(name)) ids, err := sd.client.GetChildren(sd.pathForName(name))
if err != nil { if err != nil {
...@@ -192,6 +198,7 @@ func (sd *ServiceDiscovery) QueryForInstances(name string) ([]*ServiceInstance, ...@@ -192,6 +198,7 @@ func (sd *ServiceDiscovery) QueryForInstances(name string) ([]*ServiceInstance,
return instances, nil return instances, nil
} }
// QueryForInstance query instances in zookeeper by name and id
func (sd *ServiceDiscovery) QueryForInstance(name string, id string) (*ServiceInstance, error) { func (sd *ServiceDiscovery) QueryForInstance(name string, id string) (*ServiceInstance, error) {
path := sd.pathForInstance(name, id) path := sd.pathForInstance(name, id)
data, _, err := sd.client.GetContent(path) data, _, err := sd.client.GetContent(path)
...@@ -206,18 +213,22 @@ func (sd *ServiceDiscovery) QueryForInstance(name string, id string) (*ServiceIn ...@@ -206,18 +213,22 @@ func (sd *ServiceDiscovery) QueryForInstance(name string, id string) (*ServiceIn
return instance, nil return instance, nil
} }
// QueryForInstance query all service name in zookeeper
func (sd *ServiceDiscovery) QueryForNames() ([]string, error) { func (sd *ServiceDiscovery) QueryForNames() ([]string, error) {
return sd.client.GetChildren(sd.basePath) return sd.client.GetChildren(sd.basePath)
} }
// ListenServiceEvent add a listener in a service
func (sd *ServiceDiscovery) ListenServiceEvent(name string, listener remoting.DataListener) { func (sd *ServiceDiscovery) ListenServiceEvent(name string, listener remoting.DataListener) {
sd.listener.ListenServiceEvent(nil, sd.pathForName(name), listener) sd.listener.ListenServiceEvent(nil, sd.pathForName(name), listener)
} }
// ListenServiceEvent add a listener in a instance
func (sd *ServiceDiscovery) ListenServiceInstanceEvent(name, id string, listener remoting.DataListener) { func (sd *ServiceDiscovery) ListenServiceInstanceEvent(name, id string, listener remoting.DataListener) {
sd.listener.ListenServiceNodeEvent(sd.pathForInstance(name, id), listener) sd.listener.ListenServiceNodeEvent(sd.pathForInstance(name, id), listener)
} }
// DataChange implement DataListener's DataChange function
func (sd *ServiceDiscovery) DataChange(eventType remoting.Event) bool { func (sd *ServiceDiscovery) DataChange(eventType remoting.Event) bool {
path := eventType.Path path := eventType.Path
name, id, err := sd.getNameAndId(path) name, id, err := sd.getNameAndId(path)
...@@ -229,6 +240,7 @@ func (sd *ServiceDiscovery) DataChange(eventType remoting.Event) bool { ...@@ -229,6 +240,7 @@ func (sd *ServiceDiscovery) DataChange(eventType remoting.Event) bool {
return true return true
} }
// getNameAndId get service name and instance id by path
func (sd *ServiceDiscovery) getNameAndId(path string) (string, string, error) { func (sd *ServiceDiscovery) getNameAndId(path string) (string, string, error) {
path = strings.TrimPrefix(path, sd.basePath) path = strings.TrimPrefix(path, sd.basePath)
path = strings.TrimPrefix(path, constant.PATH_SEPARATOR) path = strings.TrimPrefix(path, constant.PATH_SEPARATOR)
...@@ -241,10 +253,12 @@ func (sd *ServiceDiscovery) getNameAndId(path string) (string, string, error) { ...@@ -241,10 +253,12 @@ func (sd *ServiceDiscovery) getNameAndId(path string) (string, string, error) {
return name, id, nil return name, id, nil
} }
// nolint
func (sd *ServiceDiscovery) pathForInstance(name, id string) string { func (sd *ServiceDiscovery) pathForInstance(name, id string) string {
return path.Join(sd.basePath, name, id) return path.Join(sd.basePath, name, id)
} }
// nolint
func (sd *ServiceDiscovery) pathForName(name string) string { func (sd *ServiceDiscovery) pathForName(name string) string {
return path.Join(sd.basePath, name) return path.Join(sd.basePath, name)
} }
remoting/zookeeper/curator_discovery/service_instance.go
+ 2
− 0
View file @ ae1df23c
...@@ -17,6 +17,8 @@ ...@@ -17,6 +17,8 @@
package curator_discovery package curator_discovery
// ServiceInstance which define in curator-x-discovery, please refer to
// https://github.com/apache/curator/blob/master/curator-x-discovery/src/main/java/org/apache/curator/x/discovery/ServiceInstance.java
type ServiceInstance struct { type ServiceInstance struct {
Name string Name string
Id string Id string
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment