go/kratos
1
0
Fork 0
mirror of https://github.com/go-kratos/kratos.git synced 2025-03-17 21:07:54 +02:00
Code Issues Releases Activity

zookeeper接入kratos 服务注册发现与负载均衡

Browse Source 
1. 加入ctx.Done的情况防止groutine 泄露
2. 注册的协议，允许注册多种协议，具体选择哪种协议有client端选择
3. 去掉RootPath常量，避免歧义
This commit is contained in:
guobin 2019-10-23 15:50:06 +08:00
parent fa750fdff7
commit d9f57d5647
1 changed files with 22 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
pkg/naming/zookeeper/zookeeper.go
View File

@ -5,7 +5,6 @@ import (
"encoding/json"
"errors"
"fmt"
"strings"
"sync"
"sync/atomic"
"time"
@ -15,10 +14,6 @@ import (
"github.com/go-zookeeper/zk"
)
const (
RootPath = "/"
)
type Config struct {
// Endpoints is a list of URLs.
Endpoints []string `json:"endpoints"`
@ -176,7 +171,9 @@ func (z *ZookeeperBuilder) Register(ctx context.Context, ins *naming.Instance) (
continue
}
}
case <-time.After(time.Second):
case <-ctx.Done():
ch <- struct{}{}
return
}
}
}()
@ -226,26 +223,14 @@ func (z *ZookeeperBuilder) register(ctx context.Context, ins *naming.Instance) (
log.Warn(fmt.Sprintf("register, fail to registerPerServer node error:(%v)", err))
}
var svrAddr string
for _, val := range ins.Addrs {
if strings.HasPrefix(val, "grpc://") {
svrAddr = strings.TrimPrefix(val, "grpc://")
break
}
}
if svrAddr == "" {
errInfo := fmt.Sprintf("register, error occur, grpc svrAddr is null")
log.Error(errInfo)
return errors.New(errInfo)
}
err = z.registerEphServer(prefix, RootPath+svrAddr, ins)
err = z.registerEphServer(prefix, "/"+val, ins)
if err != nil {
log.Error(fmt.Sprintf("registerServer, fail to RegisterEphServer node error:(%v)", err))
//return
log.Warn(fmt.Sprintf("registerServer, fail to RegisterEphServer node error:(%v)", err))
} else {
log.Info(fmt.Sprintf("registerServer, succeed to RegistServer node."))
}
}
return nil
}
@ -255,20 +240,8 @@ func (z *ZookeeperBuilder) unregister(ins *naming.Instance) (err error) {
log.Info("zookeeper unregister enter, instance Addrs:(%v)", ins.Addrs)
prefix := z.keyPrefix(ins)
var svrAddr string
for _, val := range ins.Addrs {
if strings.HasPrefix(val, "grpc://") {
svrAddr = strings.TrimPrefix(val, "grpc://")
break
}
}
if svrAddr == "" {
errInfo := fmt.Sprintf("unregister, error occur, grpc svrAddr is null")
log.Error(errInfo)
return errors.New(errInfo)
}
strNode := prefix + RootPath + svrAddr
strNode := prefix + "/" + val
exists, _, err := z.cli.Exists(strNode)
if err != nil {
log.Error("zk.Conn.Exists node:(%v), error:(%s)", strNode, err.Error())
@ -284,6 +257,8 @@ func (z *ZookeeperBuilder) unregister(ins *naming.Instance) (err error) {
}
log.Info(fmt.Sprintf("unregister, client.Delete:(%v), appid:(%v), hostname:(%v) success", strNode, ins.AppID, ins.Hostname))
}
return
}
@ -336,7 +311,7 @@ func (a *appInfo) fetchstore(appID string) (err error) {
//for range childs
for _, child := range childs {
strNode = prefix + RootPath + child
strNode = prefix + "/" + child
resp, _, err := a.zkb.cli.Get(strNode)
if err != nil {
log.Error("zookeeper: fetch client.Get(%s) error(%v)", strNode, err)