From 254c0ea8147d2de50de80cf8a8b803f3ddc5f5f8 Mon Sep 17 00:00:00 2001 From: Anthony Romano Date: Thu, 25 Aug 2016 18:34:13 -0700 Subject: [PATCH] etcdserver: use request timeout defined by ServerConfig for v3 requests --- etcdserver/v3_server.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/etcdserver/v3_server.go b/etcdserver/v3_server.go index dca135c46..3e041d239 100644 --- a/etcdserver/v3_server.go +++ b/etcdserver/v3_server.go @@ -35,9 +35,6 @@ const ( // specify a large value might end up with shooting in the foot. maxRequestBytes = 1.5 * 1024 * 1024 - // max timeout for waiting a v3 request to go through raft. - maxV3RequestTimeout = 5 * time.Second - // In the health case, there might be a small gap (10s of entries) between // the applied index and committed index. // However, if the committed entries are very heavy to apply, the gap might grow. @@ -557,7 +554,7 @@ func (s *EtcdServer) processInternalRaftRequestOnce(ctx context.Context, r pb.In } ch := s.w.Register(id) - cctx, cancel := context.WithTimeout(ctx, maxV3RequestTimeout) + cctx, cancel := context.WithTimeout(ctx, s.Cfg.ReqTimeout()) defer cancel() start := time.Now()