mirror of
https://github.com/etcd-io/etcd.git
synced 2024-09-27 06:25:44 +00:00
8ec4215279
Couldn't find watcher group from rid on server stream close, leading to the watcher group sending on a closed channel. Also got rid of send closing the watcher stream if the buffer is full, this could lead to a send after close while broadcasting to all receivers. Instead, if a send times out then the server stream is canceled. Fixes #6739
95 lines
2.0 KiB
Go
95 lines
2.0 KiB
Go
// Copyright 2016 The etcd Authors
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package grpcproxy
|
|
|
|
import (
|
|
"time"
|
|
|
|
"github.com/coreos/etcd/clientv3"
|
|
pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
|
|
"github.com/coreos/etcd/mvcc"
|
|
"github.com/coreos/etcd/mvcc/mvccpb"
|
|
)
|
|
|
|
type watchRange struct {
|
|
key, end string
|
|
}
|
|
|
|
type watcher struct {
|
|
id int64
|
|
wr watchRange
|
|
sws *serverWatchStream
|
|
|
|
rev int64
|
|
filters []mvcc.FilterFunc
|
|
progress bool
|
|
}
|
|
|
|
func (w *watcher) send(wr clientv3.WatchResponse) {
|
|
if wr.IsProgressNotify() && !w.progress {
|
|
return
|
|
}
|
|
|
|
events := make([]*mvccpb.Event, 0, len(wr.Events))
|
|
|
|
var lastRev int64
|
|
for i := range wr.Events {
|
|
ev := (*mvccpb.Event)(wr.Events[i])
|
|
if ev.Kv.ModRevision <= w.rev {
|
|
continue
|
|
} else {
|
|
// We cannot update w.rev here.
|
|
// txn can have multiple events with the same rev.
|
|
// If we update w.rev here, we would skip some events in the same txn.
|
|
lastRev = ev.Kv.ModRevision
|
|
}
|
|
|
|
filtered := false
|
|
if len(w.filters) != 0 {
|
|
for _, filter := range w.filters {
|
|
if filter(*ev) {
|
|
filtered = true
|
|
break
|
|
}
|
|
}
|
|
}
|
|
|
|
if !filtered {
|
|
events = append(events, ev)
|
|
}
|
|
}
|
|
|
|
if lastRev > w.rev {
|
|
w.rev = lastRev
|
|
}
|
|
|
|
// all events are filtered out?
|
|
if !wr.IsProgressNotify() && !wr.Created && len(events) == 0 {
|
|
return
|
|
}
|
|
|
|
pbwr := &pb.WatchResponse{
|
|
Header: &wr.Header,
|
|
Created: wr.Created,
|
|
WatchId: w.id,
|
|
Events: events,
|
|
}
|
|
select {
|
|
case w.sws.watchCh <- pbwr:
|
|
case <-time.After(50 * time.Millisecond):
|
|
w.sws.cancel()
|
|
}
|
|
}
|