milvus-io
/
milvus
mirror of https://github.com/milvus-io/milvus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve timeout log when query in QueryNode (#14766) 

Signed-off-by: bigsheeper <yihao.dai@zilliz.com>
pull/14829/head
bigsheeper 2022-01-05 10:35:31 +08:00 committed by GitHub
parent 1e7c51859a
commit 12f37ffb57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
internal/querynode/query_collection.go
View File

@ -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)