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

protect etcd watcher stop against race condition

Browse Source
This commit is contained in:
Asim Aslam 2020-08-08 00:57:57 +01:00
parent 712fe39a62
commit e7cc3c2210
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
registry/etcd/watcher.go
View File

@ -3,6 +3,7 @@ package etcd
import ( import (
"context" "context"
"errors" "errors"
"sync"
"time" "time"
"github.com/coreos/etcd/clientv3" "github.com/coreos/etcd/clientv3"
@ -10,10 +11,12 @@ import (
) )
type etcdWatcher struct { type etcdWatcher struct {
stop chan bool
w clientv3.WatchChan w clientv3.WatchChan
client *clientv3.Client client *clientv3.Client
timeout time.Duration timeout time.Duration
mtx sync.Mutex
stop chan bool
} }
func newEtcdWatcher(r *etcdRegistry, timeout time.Duration, opts ...registry.WatchOption) (registry.Watcher, error) { func newEtcdWatcher(r *etcdRegistry, timeout time.Duration, opts ...registry.WatchOption) (registry.Watcher, error) {
@ -90,6 +93,9 @@ func (ew *etcdWatcher) Next() (*registry.Result, error) {
} }
func (ew *etcdWatcher) Stop() { func (ew *etcdWatcher) Stop() {
ew.mtx.Lock()
defer ew.mtx.Unlock()
select { select {
case <-ew.stop: case <-ew.stop:
return return