From 12f37ffb5758850d637d087a6da7103f6e4bcbb9 Mon Sep 17 00:00:00 2001 From: bigsheeper Date: Wed, 5 Jan 2022 10:35:31 +0800 Subject: [PATCH] Improve timeout log when query in QueryNode (#14766) Signed-off-by: bigsheeper --- internal/querynode/query_collection.go | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/internal/querynode/query_collection.go b/internal/querynode/query_collection.go index a37c5f5376..dc1dc960c5 100644 --- a/internal/querynode/query_collection.go +++ b/internal/querynode/query_collection.go @@ -318,16 +318,16 @@ func (q *queryCollection) setServiceableTime(t Timestamp) { func (q *queryCollection) checkTimeout(msg queryMsg) bool { curTime := tsoutil.GetCurrentTime() - //curTimePhysical, _ := tsoutil.ParseTS(curTime) - //timeoutTsPhysical, _ := tsoutil.ParseTS(msg.TimeoutTs()) - //log.Debug("check if query timeout", - // zap.Any("collectionID", q.collectionID), - // zap.Any("msgID", msg.ID()), - // zap.Any("TimeoutTs", msg.TimeoutTs()), - // zap.Any("curTime", curTime), - // zap.Any("timeoutTsPhysical", timeoutTsPhysical), - // zap.Any("curTimePhysical", curTimePhysical), - //) + curTimePhysical, _ := tsoutil.ParseTS(curTime) + timeoutTsPhysical, _ := tsoutil.ParseTS(msg.TimeoutTs()) + log.Debug("check if query timeout", + zap.Int64("collectionID", q.collectionID), + zap.Int64("msgID", msg.ID()), + zap.Uint64("TimeoutTs", msg.TimeoutTs()), + zap.Uint64("curTime", curTime), + zap.Time("timeoutTsPhysical", timeoutTsPhysical), + zap.Time("curTimePhysical", curTimePhysical), + ) return msg.TimeoutTs() > typeutil.ZeroTimestamp && curTime >= msg.TimeoutTs() } @@ -460,9 +460,8 @@ func (q *queryCollection) receiveQueryMsg(msg queryMsg) error { tr := timerecord.NewTimeRecorder(fmt.Sprintf("receiveQueryMsg %d", msg.ID())) if q.checkTimeout(msg) { - err := errors.New(fmt.Sprintln("do query failed in receiveQueryMsg because timeout"+ - ", collectionID = ", collectionID, - ", msgID = ", msg.ID())) + err := fmt.Errorf("do query failed in receiveQueryMsg because timeout, "+ + "collectionID = %d, msgID = %d, timeoutTS = %d", collectionID, msg.ID(), msg.TimeoutTs()) publishErr := q.publishFailedQueryResult(msg, err.Error()) if publishErr != nil { return fmt.Errorf("first err = %s, second err = %s", err, publishErr)