unistack-org/micro
3
0
Fork 3
Code Issues 14 Pull Requests 2 Actions Packages Projects Releases 242 Wiki Activity

use a totally different client for the watcher in etcd

Browse Source
This commit is contained in:
Asim Aslam 2020-08-08 01:40:41 +01:00
parent fc67593ee4
commit 4469a41ae7
2 changed files with 36 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
registry/etcd/etcd.go
View File

@ -51,13 +51,10 @@ func NewRegistry(opts ...registry.Option) registry.Registry {
return e return e
} }
func configure(e *etcdRegistry, opts ...registry.Option) error { func newClient(e *etcdRegistry) (*clientv3.Client, error) {
config := clientv3.Config{ config := clientv3.Config{
Endpoints: []string{"127.0.0.1:2379"}, Endpoints: []string{"127.0.0.1:2379"},
} }
for _, o := range opts {
o(&e.options)
}
if e.options.Timeout == 0 { if e.options.Timeout == 0 {
e.options.Timeout = 5 * time.Second e.options.Timeout = 5 * time.Second
@ -117,17 +114,32 @@ func configure(e *etcdRegistry, opts ...registry.Option) error {
} }
cli, err := clientv3.New(config) cli, err := clientv3.New(config)
if err != nil {
return nil, err
}
return cli, nil
}
// configure will setup the registry with new options
func configure(e *etcdRegistry, opts ...registry.Option) error {
for _, o := range opts {
o(&e.options)
}
// setup the client
cli, err := newClient(e)
if err != nil { if err != nil {
return err return err
} }
// close the existing client
if e.client != nil { if e.client != nil {
e.client.Close() e.client.Close()
} }
// set the new client // setup new client
e.client = cli e.client = cli
return nil return nil
} }
@ -566,7 +578,11 @@ func (e *etcdRegistry) ListServices(opts ...registry.ListOption) ([]*registry.Se
} }
func (e *etcdRegistry) Watch(opts ...registry.WatchOption) (registry.Watcher, error) { func (e *etcdRegistry) Watch(opts ...registry.WatchOption) (registry.Watcher, error) {
return newEtcdWatcher(e, e.options.Timeout, opts...) cli, err := newClient(e)
if err != nil {
return nil, err
}
return newEtcdWatcher(cli, e.options.Timeout, opts...)
} }
func (e *etcdRegistry) String() string { func (e *etcdRegistry) String() string {

26
registry/etcd/watcher.go
View File

@ -15,11 +15,12 @@ type etcdWatcher struct {
client *clientv3.Client client *clientv3.Client
timeout time.Duration timeout time.Duration
mtx sync.Mutex mtx sync.Mutex
stop chan bool stop chan bool
cancel func()
} }
func newEtcdWatcher(r *etcdRegistry, timeout time.Duration, opts ...registry.WatchOption) (registry.Watcher, error) { func newEtcdWatcher(c *clientv3.Client, timeout time.Duration, opts ...registry.WatchOption) (registry.Watcher, error) {
var wo registry.WatchOptions var wo registry.WatchOptions
for _, o := range opts { for _, o := range opts {
o(&wo) o(&wo)
@ -28,14 +29,6 @@ func newEtcdWatcher(r *etcdRegistry, timeout time.Duration, opts ...registry.Wat
wo.Domain = defaultDomain wo.Domain = defaultDomain
} }
ctx, cancel := context.WithCancel(context.Background())
stop := make(chan bool, 1)
go func() {
<-stop
cancel()
}()
watchPath := prefix watchPath := prefix
if wo.Domain == registry.WildcardDomain { if wo.Domain == registry.WildcardDomain {
if len(wo.Service) > 0 { if len(wo.Service) > 0 {
@ -46,10 +39,15 @@ func newEtcdWatcher(r *etcdRegistry, timeout time.Duration, opts ...registry.Wat
watchPath = servicePath(wo.Domain, wo.Service) + "/" watchPath = servicePath(wo.Domain, wo.Service) + "/"
} }
ctx, cancel := context.WithCancel(context.Background())
w := c.Watch(ctx, watchPath, clientv3.WithPrefix(), clientv3.WithPrevKV())
stop := make(chan bool, 1)
return &etcdWatcher{ return &etcdWatcher{
cancel: cancel,
stop: stop, stop: stop,
w: r.client.Watch(ctx, watchPath, clientv3.WithPrefix(), clientv3.WithPrevKV()), w: w,
client: r.client, client: c,
timeout: timeout, timeout: timeout,
}, nil }, nil
} }
@ -101,5 +99,7 @@ func (ew *etcdWatcher) Stop() {
return return
default: default:
close(ew.stop) close(ew.stop)
ew.cancel()
ew.client.Close()
} }
} }