vitalif
/
etcd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

v3rpc: lock progress and prevKV map correctly

release-3.0
Xiang Li 2016-07-07 15:01:05 -07:00 committed by Gyu-Ho Lee
parent e406e6e8f4
commit 836c8159f6
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etcdserver/api/v3rpc/watch.go
View File

@ -178,6 +178,7 @@ func (sws *serverWatchStream) recvLoop() error {
}
id := sws.watchStream.Watch(creq.Key, creq.RangeEnd, rev)
if id != -1 {
sws.mu.Lock()
if creq.ProgressNotify {
sws.mu.Lock()
sws.progress[id] = true
@ -188,6 +189,7 @@ func (sws *serverWatchStream) recvLoop() error {
sws.prevKV[id] = true
sws.mu.Unlock()
}
sws.mu.Unlock()
}
wr := &pb.WatchResponse{
Header: sws.newResponseHeader(wsrev),
@ -259,7 +261,9 @@ func (sws *serverWatchStream) sendLoop() {
// or define protocol buffer with []mvccpb.Event.
evs := wresp.Events
events := make([]*mvccpb.Event, len(evs))
sws.mu.Lock()
needPrevKV := sws.prevKV[wresp.WatchID]
sws.mu.Unlock()
for i := range evs {
events[i] = &evs[i]