mirrors/etcd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7176 from heyitsanthony/bump-lread-timeout

Browse Source 
etcdserver: use ReqTimeout for linearized read
This commit is contained in:
Anthony Romano
2017-01-17 16:08:50 -08:00
committed by GitHub
parent 307e14028c 5c774ff571
commit 1a962df596
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
etcdserver/v3_server.go
View File

@ -714,7 +714,6 @@ func (s *EtcdServer) Watchable() mvcc.WatchableKV { return s.KV() }
func (s *EtcdServer) linearizableReadLoop() { func (s *EtcdServer) linearizableReadLoop() {
var rs raft.ReadState var rs raft.ReadState
internalTimeout := time.Second
for { for {
ctx := make([]byte, 8) ctx := make([]byte, 8)
@ -733,7 +732,7 @@ func (s *EtcdServer) linearizableReadLoop() {
s.readNotifier = nextnr s.readNotifier = nextnr
s.readMu.Unlock() s.readMu.Unlock()
cctx, cancel := context.WithTimeout(context.Background(), internalTimeout) cctx, cancel := context.WithTimeout(context.Background(), s.Cfg.ReqTimeout())
if err := s.r.ReadIndex(cctx, ctx); err != nil { if err := s.r.ReadIndex(cctx, ctx); err != nil {
cancel() cancel()
if err == raft.ErrStopped { if err == raft.ErrStopped {
@ -758,7 +757,7 @@ func (s *EtcdServer) linearizableReadLoop() {
// continue waiting for the response of the current requests. // continue waiting for the response of the current requests.
plog.Warningf("ignored out-of-date read index response (want %v, got %v)", rs.RequestCtx, ctx) plog.Warningf("ignored out-of-date read index response (want %v, got %v)", rs.RequestCtx, ctx)
} }
case <-time.After(internalTimeout): case <-time.After(s.Cfg.ReqTimeout()):
plog.Warningf("timed out waiting for read index response") plog.Warningf("timed out waiting for read index response")
nr.notify(ErrTimeout) nr.notify(ErrTimeout)
timeout = true timeout = true