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

Merge pull request #10974 from lzhfromustc/watchers

Browse Source 
proxy: Add critical section to protect wps.watchers and wps.nextWatcherID
This commit is contained in:
Xiang Li 2019-08-14 16:14:27 -07:00 committed by GitHub
commit bbb379fa4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
proxy/grpcproxy/watch.go
View File

@ -241,6 +241,7 @@ func (wps *watchProxyStream) recvLoop() error {
continue continue
} }
wps.mu.Lock()
w := &watcher{ w := &watcher{
wr: watchRange{string(cr.Key), string(cr.RangeEnd)}, wr: watchRange{string(cr.Key), string(cr.RangeEnd)},
id: wps.nextWatcherID, id: wps.nextWatcherID,
@ -259,6 +260,7 @@ func (wps *watchProxyStream) recvLoop() error {
w.nextrev = cr.StartRevision w.nextrev = cr.StartRevision
wps.watchers[w.id] = w wps.watchers[w.id] = w
wps.ranges.add(w) wps.ranges.add(w)
wps.mu.Unlock()
case *pb.WatchRequest_CancelRequest: case *pb.WatchRequest_CancelRequest:
wps.delete(uv.CancelRequest.WatchId) wps.delete(uv.CancelRequest.WatchId)
default: default: