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

enhance: add the tick log for the tt msgstream seek method (#34397) 

/kind improvement

Signed-off-by: SimFG <bang.fu@zilliz.com>
pull/34346/head
SimFG 2024-07-04 10:18:09 +08:00 committed by GitHub
parent 8a2be8a457
commit c6e2900cfc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/mq/msgstream/mq_msgstream.go
View File

@ -888,6 +888,9 @@ func (ms *MqTtMsgStream) Seek(ctx context.Context, msgPositions []*MsgPosition,
ms.consumerLock.Lock() ms.consumerLock.Lock()
defer ms.consumerLock.Unlock() defer ms.consumerLock.Unlock()
loopTick := time.NewTicker(5 * time.Second)
defer loopTick.Stop()
for idx := range msgPositions { for idx := range msgPositions {
mp = msgPositions[idx] mp = msgPositions[idx]
if len(mp.MsgID) == 0 { if len(mp.MsgID) == 0 {
@ -903,16 +906,21 @@ func (ms *MqTtMsgStream) Seek(ctx context.Context, msgPositions []*MsgPosition,
// skip all data before current tt // skip all data before current tt
runLoop := true runLoop := true
loopMsgCnt := 0
loopStarTime := time.Now()
for runLoop { for runLoop {
select { select {
case <-ms.ctx.Done(): case <-ms.ctx.Done():
return ms.ctx.Err() return ms.ctx.Err()
case <-ctx.Done(): case <-ctx.Done():
return ctx.Err() return ctx.Err()
case <-loopTick.C:
log.Info("seek loop tick", zap.Int("loopMsgCnt", loopMsgCnt), zap.String("channel", mp.ChannelName))
case msg, ok := <-consumer.Chan(): case msg, ok := <-consumer.Chan():
if !ok { if !ok {
return fmt.Errorf("consumer closed") return fmt.Errorf("consumer closed")
} }
loopMsgCnt++
consumer.Ack(msg) consumer.Ack(msg)
headerMsg := commonpb.MsgHeader{} headerMsg := commonpb.MsgHeader{}
@ -926,6 +934,12 @@ func (ms *MqTtMsgStream) Seek(ctx context.Context, msgPositions []*MsgPosition,
} }
if tsMsg.Type() == commonpb.MsgType_TimeTick && tsMsg.BeginTs() >= mp.Timestamp { if tsMsg.Type() == commonpb.MsgType_TimeTick && tsMsg.BeginTs() >= mp.Timestamp {
runLoop = false runLoop = false
if time.Since(loopStarTime) > 30*time.Second {
log.Info("seek loop finished long time",
zap.Int("loopMsgCnt", loopMsgCnt),
zap.String("channel", mp.ChannelName),
zap.Duration("cost", time.Since(loopStarTime)))
}
} else if tsMsg.BeginTs() > mp.Timestamp { } else if tsMsg.BeginTs() > mp.Timestamp {
ctx, _ := ExtractCtx(tsMsg, msg.Properties()) ctx, _ := ExtractCtx(tsMsg, msg.Properties())
tsMsg.SetTraceCtx(ctx) tsMsg.SetTraceCtx(ctx)