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

v3rpc: do not send closing event

Browse Source 
When a watch stream closes, both of the watcher.Chan and closec
will be closed.

If watcher.Chan is closed, we should not send out the empty event.
Sending the empty is wrong and waste a lot of CPU resources.
Instead we should just return.
This commit is contained in:
Xiang Li 2015-11-19 17:56:06 -08:00
parent c400d05d0a
commit 3cf90a4dff
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,7 +61,10 @@ func (ws *watchServer) Watch(stream pb.Watch_WatchServer) error {
func sendLoop(stream pb.Watch_WatchServer, watcher storage.Watcher, closec chan struct{}) {
for {
select {
case e := <-watcher.Chan():
case e, ok := <-watcher.Chan():
if !ok {
return
}
err := stream.Send(&pb.WatchResponse{Event: &e})
if err != nil {
return