opensource/grpc-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add a mutex to guard w.kv

Browse Source
This commit is contained in:
iamqizhao
2015-10-07 16:56:15 -07:00
parent 8d7cb9253d
commit a80cf8dfe9
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
naming/etcd/etcd.go
View File

@ -92,6 +92,7 @@ func NewResolver(cfg etcdcl.Config) (naming.Resolver, error) {
type watcher struct { type watcher struct {
wr etcdcl.Watcher wr etcdcl.Watcher
mu sync.Mutex
kv map[string]string kv map[string]string
} }
@ -123,6 +124,7 @@ func (w *watcher) Next(ctx context.Context) (nu []*naming.Update, err error) {
if resp.Node.Dir { if resp.Node.Dir {
continue continue
} }
w.mu.Lock()
switch resp.Action { switch resp.Action {
case "set": case "set":
if resp.PrevNode == nil { if resp.PrevNode == nil {
@ -149,6 +151,7 @@ func (w *watcher) Next(ctx context.Context) (nu []*naming.Update, err error) {
}) })
delete(w.kv, resp.Node.Key) delete(w.kv, resp.Node.Key)
} }
w.mu.Unlock()
return nu, nil return nu, nil
} }
} }