未验证 提交 8c6c031e 编写于 作者: Z zhenshan.cao 提交者: GitHub

FixBug:update serviceableTime incorrectly (#11769)

Signed-off-by: Nzhenshan.cao <zhenshan.cao@zilliz.com>
上级 902e856a
......@@ -62,7 +62,7 @@ type queryCollection struct {
tSafeUpdate bool
watcherCond *sync.Cond
serviceableTimeMutex sync.Mutex // guards serviceableTime
serviceableTimeMutex sync.RWMutex // guards serviceableTime
serviceableTime Timestamp
queryMsgStream msgstream.MsgStream
......@@ -252,9 +252,14 @@ func (q *queryCollection) waitNewTSafe() (Timestamp, error) {
}
func (q *queryCollection) getServiceableTime() Timestamp {
q.serviceableTimeMutex.Lock()
defer q.serviceableTimeMutex.Unlock()
return q.serviceableTime
gracefulTimeInMilliSecond := Params.GracefulTime
gracefulTime := typeutil.ZeroTimestamp
if gracefulTimeInMilliSecond > 0 {
gracefulTime = tsoutil.ComposeTS(gracefulTimeInMilliSecond, 0)
}
q.serviceableTimeMutex.RLock()
defer q.serviceableTimeMutex.RUnlock()
return q.serviceableTime + gracefulTime
}
func (q *queryCollection) setServiceableTime(t Timestamp) {
......@@ -264,14 +269,7 @@ func (q *queryCollection) setServiceableTime(t Timestamp) {
if t < q.serviceableTime {
return
}
gracefulTimeInMilliSecond := Params.GracefulTime
if gracefulTimeInMilliSecond > 0 {
gracefulTime := tsoutil.ComposeTS(gracefulTimeInMilliSecond, 0)
q.serviceableTime = t + gracefulTime
} else {
q.serviceableTime = t
}
q.serviceableTime = t
}
func (q *queryCollection) consumeQuery() {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册