From 1cd6e80c8ad2bc89ac79979625cda667183caabb Mon Sep 17 00:00:00 2001 From: xige-16 Date: Thu, 22 Sep 2022 14:14:52 +0800 Subject: [PATCH] Increase timeout of activate task (#19330) Signed-off-by: xige-16 Signed-off-by: xige-16 --- configs/milvus.yaml | 2 +- internal/querycoordv2/handlers.go | 10 ++++------ internal/util/paramtable/component_param.go | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/configs/milvus.yaml b/configs/milvus.yaml index acadb8e87..ef3052a89 100644 --- a/configs/milvus.yaml +++ b/configs/milvus.yaml @@ -181,7 +181,7 @@ queryCoord: memoryUsageMaxDifferencePercentage: 30 checkInterval: 1000 channelTaskTimeout: 60000 # 1 minute - segmentTaskTimeout: 15000 # 15 seconds + segmentTaskTimeout: 120000 # 2 minute distPullInterval: 500 loadTimeoutSeconds: 600 checkHandoffInterval: 5000 diff --git a/internal/querycoordv2/handlers.go b/internal/querycoordv2/handlers.go index 7f33b9c83..ec1b311fa 100644 --- a/internal/querycoordv2/handlers.go +++ b/internal/querycoordv2/handlers.go @@ -5,7 +5,9 @@ import ( "errors" "fmt" "sync" - "time" + + "github.com/samber/lo" + "go.uber.org/zap" "github.com/milvus-io/milvus/api/commonpb" "github.com/milvus-io/milvus/api/milvuspb" @@ -19,8 +21,6 @@ import ( "github.com/milvus-io/milvus/internal/util/metricsinfo" "github.com/milvus-io/milvus/internal/util/typeutil" "github.com/milvus-io/milvus/internal/util/uniquegenerator" - "github.com/samber/lo" - "go.uber.org/zap" ) // checkAnyReplicaAvailable checks if the collection has enough distinct available shards. These shards @@ -60,9 +60,7 @@ func (s *Server) getCollectionSegmentInfo(collection int64) []*querypb.SegmentIn // parseBalanceRequest parses the load balance request, // returns the collection, replica, and segments func (s *Server) balanceSegments(ctx context.Context, req *querypb.LoadBalanceRequest, replica *meta.Replica) error { - const ( - manualBalanceTimeout = 10 * time.Second - ) + manualBalanceTimeout := Params.QueryCoordCfg.SegmentTaskTimeout srcNode := req.GetSourceNodeIDs()[0] dstNodeSet := typeutil.NewUniqueSet(req.GetDstNodeIDs()...) diff --git a/internal/util/paramtable/component_param.go b/internal/util/paramtable/component_param.go index 66f46fad3..6d5abe02e 100644 --- a/internal/util/paramtable/component_param.go +++ b/internal/util/paramtable/component_param.go @@ -723,7 +723,7 @@ func (p *queryCoordConfig) initChannelTaskTimeout() { } func (p *queryCoordConfig) initSegmentTaskTimeout() { - timeout := p.Base.LoadWithDefault("queryCoord.segmentTaskTimeout", "15000") + timeout := p.Base.LoadWithDefault("queryCoord.segmentTaskTimeout", "120000") taskTimeout, err := strconv.ParseInt(timeout, 10, 64) if err != nil { panic(err) -- GitLab