Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

store: fix watcher removal

Browse Source
This commit is contained in:
Xiang Li 2015-04-03 10:13:43 -07:00 committed by Yicheng Qin
parent e93f8b8a12
commit a88b22ac0a
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
etcdserver/etcdhttp/client.go
View File

@ -119,7 +119,6 @@ func (h *keysHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
writeError(w, err) writeError(w, err)
return return
} }
switch { switch {
case resp.Event != nil: case resp.Event != nil:
if err := writeKeyEvent(w, resp.Event, h.timer); err != nil { if err := writeKeyEvent(w, resp.Event, h.timer); err != nil {

2
store/watcher_hub.go
View File

@ -84,7 +84,6 @@ func (wh *watcherHub) watch(key string, recursive, stream bool, index, storeInde
if ok { // add the new watcher to the back of the list if ok { // add the new watcher to the back of the list
elem = l.PushBack(w) elem = l.PushBack(w)
} else { // create a new list and add the new watcher } else { // create a new list and add the new watcher
l = list.New() l = list.New()
elem = l.PushBack(w) elem = l.PushBack(w)
@ -146,6 +145,7 @@ func (wh *watcherHub) notifyWatchers(e *Event, nodePath string, deleted bool) {
// if we successfully notify a watcher // if we successfully notify a watcher
// we need to remove the watcher from the list // we need to remove the watcher from the list
// and decrease the counter // and decrease the counter
w.removed = true
l.Remove(curr) l.Remove(curr)
atomic.AddInt64(&wh.count, -1) atomic.AddInt64(&wh.count, -1)
} }