admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2026-01-07 19:31:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix deadlock of channels time ticker (#7444)

Browse Source 
Signed-off-by: dragondriver <jiquan.long@zilliz.com>
This commit is contained in:
dragondriver 2021-09-03 11:53:29 +08:00 committed by GitHub
parent 8b1ae98fa9
commit 9b87da1ee8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
internal/proxy/channels_time_ticker.go
View File

@ -92,17 +92,18 @@ func (ticker *channelsTimeTickerImpl) tick() error {
return err
}
stats, err := ticker.getStatisticsFunc()
if err != nil {
log.Debug("Proxy channelsTimeTickerImpl failed to getStatistics", zap.Error(err))
return nil
}
ticker.statisticsMtx.Lock()
defer ticker.statisticsMtx.Unlock()
ticker.currentsMtx.Lock()
defer ticker.currentsMtx.Unlock()
stats, err := ticker.getStatisticsFunc()
if err != nil {
log.Debug("Proxy channelsTimeTickerImpl failed to getStatistics", zap.Error(err))
}
for pchan := range ticker.currents {
current := ticker.currents[pchan]
stat, ok := stats[pchan]