admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2025-12-07 01:28:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix the refresh may be notified finished early (#24438)

Browse Source 
Signed-off-by: yah01 <yah2er0ne@outlook.com>
This commit is contained in:
yah01 2023-05-26 18:43:26 +08:00 committed by GitHub
parent 5efa49f112
commit 848ef7418b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
internal/querycoordv2/meta/target_manager.go
View File

@ -61,7 +61,7 @@ func NewTargetManager(broker Broker, meta *Meta) *TargetManager {
// UpdateCollectionCurrentTarget updates the current target to next target, // UpdateCollectionCurrentTarget updates the current target to next target,
// WARN: DO NOT call this method for an existing collection as target observer running, or it will lead to a double-update, // WARN: DO NOT call this method for an existing collection as target observer running, or it will lead to a double-update,
// which may make the current target not available // which may make the current target not available
func (mgr *TargetManager) UpdateCollectionCurrentTarget(collectionID int64, partitionIDs ...int64) { func (mgr *TargetManager) UpdateCollectionCurrentTarget(collectionID int64, partitionIDs ...int64) bool {
mgr.rwMutex.Lock() mgr.rwMutex.Lock()
defer mgr.rwMutex.Unlock() defer mgr.rwMutex.Unlock()
log := log.With(zap.Int64("collectionID", collectionID), log := log.With(zap.Int64("collectionID", collectionID),
@ -72,7 +72,7 @@ func (mgr *TargetManager) UpdateCollectionCurrentTarget(collectionID int64, part
newTarget := mgr.next.getCollectionTarget(collectionID) newTarget := mgr.next.getCollectionTarget(collectionID)
if newTarget == nil || newTarget.IsEmpty() { if newTarget == nil || newTarget.IsEmpty() {
log.Info("next target does not exist, skip it") log.Info("next target does not exist, skip it")
return return false
} }
mgr.current.updateCollectionTarget(collectionID, newTarget) mgr.current.updateCollectionTarget(collectionID, newTarget)
mgr.next.removeCollectionTarget(collectionID) mgr.next.removeCollectionTarget(collectionID)
@ -80,6 +80,7 @@ func (mgr *TargetManager) UpdateCollectionCurrentTarget(collectionID int64, part
log.Debug("finish to update current target for collection", log.Debug("finish to update current target for collection",
zap.Int64s("segments", newTarget.GetAllSegmentIDs()), zap.Int64s("segments", newTarget.GetAllSegmentIDs()),
zap.Strings("channels", newTarget.GetAllDmChannelNames())) zap.Strings("channels", newTarget.GetAllDmChannelNames()))
return true
} }
// UpdateCollectionNextTargetWithPartitions pulls next target from DataCoord, // UpdateCollectionNextTargetWithPartitions pulls next target from DataCoord,

4
internal/querycoordv2/observers/target_observer.go
View File

@ -273,8 +273,7 @@ func (ob *TargetObserver) shouldUpdateCurrentTarget(collectionID int64) bool {
func (ob *TargetObserver) updateCurrentTarget(collectionID int64) { func (ob *TargetObserver) updateCurrentTarget(collectionID int64) {
log.Info("observer trigger update current target", zap.Int64("collectionID", collectionID)) log.Info("observer trigger update current target", zap.Int64("collectionID", collectionID))
ob.targetMgr.UpdateCollectionCurrentTarget(collectionID) if ob.targetMgr.UpdateCollectionCurrentTarget(collectionID) {
ob.mut.Lock() ob.mut.Lock()
defer ob.mut.Unlock() defer ob.mut.Unlock()
notifiers := ob.readyNotifiers[collectionID] notifiers := ob.readyNotifiers[collectionID]
@ -285,4 +284,5 @@ func (ob *TargetObserver) updateCurrentTarget(collectionID int64) {
if notifiers != nil { if notifiers != nil {
ob.readyNotifiers[collectionID] = notifiers[:0] ob.readyNotifiers[collectionID] = notifiers[:0]
} }
}
} }