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

enhance: Provide secondary index critria when filter leaderview (#37777)

Browse Source 
Related to #37630

---------

Signed-off-by: Congqi Xia <congqi.xia@zilliz.com>
This commit is contained in:
congqixia 2024-11-19 10:12:30 +08:00 committed by GitHub
parent 3d28d99411
commit 6d86b9022e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -325,7 +325,9 @@ func (ob *CollectionObserver) observePartitionLoadStatus(ctx context.Context, pa
} }
subChannelCount := loadedCount subChannelCount := loadedCount
for _, segment := range segmentTargets { for _, segment := range segmentTargets {
views := ob.dist.LeaderViewManager.GetByFilter(meta.WithSegment2LeaderView(segment.GetID(), false)) views := ob.dist.LeaderViewManager.GetByFilter(
meta.WithChannelName2LeaderView(segment.GetInsertChannel()),
meta.WithSegment2LeaderView(segment.GetID(), false))
nodes := lo.Map(views, func(view *meta.LeaderView, _ int) int64 { return view.ID }) nodes := lo.Map(views, func(view *meta.LeaderView, _ int) int64 { return view.ID })
group := utils.GroupNodesByReplica(ob.meta.ReplicaManager, partition.GetCollectionID(), nodes) group := utils.GroupNodesByReplica(ob.meta.ReplicaManager, partition.GetCollectionID(), nodes)
loadedCount += len(group) loadedCount += len(group)

4
internal/querycoordv2/task/action.go
View File

@ -124,7 +124,9 @@ func (action *SegmentAction) IsFinished(distMgr *meta.DistributionManager) bool
} }
// segment found in leader view // segment found in leader view
views := distMgr.LeaderViewManager.GetByFilter(meta.WithSegment2LeaderView(action.SegmentID, false)) views := distMgr.LeaderViewManager.GetByFilter(
meta.WithChannelName2LeaderView(action.Shard),
meta.WithSegment2LeaderView(action.SegmentID, false))
if len(views) == 0 { if len(views) == 0 {
return false return false
} }

4
internal/querycoordv2/task/scheduler.go
View File

@ -351,7 +351,9 @@ func (scheduler *taskScheduler) preAdd(task Task) error {
taskType := GetTaskType(task) taskType := GetTaskType(task)
if taskType == TaskTypeMove { if taskType == TaskTypeMove {
views := scheduler.distMgr.LeaderViewManager.GetByFilter(meta.WithSegment2LeaderView(task.SegmentID(), false)) views := scheduler.distMgr.LeaderViewManager.GetByFilter(
meta.WithChannelName2LeaderView(task.Shard()),
meta.WithSegment2LeaderView(task.SegmentID(), false))
if len(views) == 0 { if len(views) == 0 {
return merr.WrapErrServiceInternal("segment's delegator not found, stop balancing") return merr.WrapErrServiceInternal("segment's delegator not found, stop balancing")
} }

3
internal/querycoordv2/task/task_test.go
View File

@ -478,6 +478,7 @@ func (suite *TaskSuite) TestLoadSegmentTask() {
ID: targetNode, ID: targetNode,
CollectionID: suite.collection, CollectionID: suite.collection,
Segments: map[int64]*querypb.SegmentDist{}, Segments: map[int64]*querypb.SegmentDist{},
Channel: channel.ChannelName,
} }
for _, segment := range suite.loadSegments { for _, segment := range suite.loadSegments {
view.Segments[segment] = &querypb.SegmentDist{NodeID: targetNode, Version: 0} view.Segments[segment] = &querypb.SegmentDist{NodeID: targetNode, Version: 0}
@ -577,6 +578,7 @@ func (suite *TaskSuite) TestLoadSegmentTaskNotIndex() {
ID: targetNode, ID: targetNode,
CollectionID: suite.collection, CollectionID: suite.collection,
Segments: map[int64]*querypb.SegmentDist{}, Segments: map[int64]*querypb.SegmentDist{},
Channel: channel.ChannelName,
} }
for _, segment := range suite.loadSegments { for _, segment := range suite.loadSegments {
view.Segments[segment] = &querypb.SegmentDist{NodeID: targetNode, Version: 0} view.Segments[segment] = &querypb.SegmentDist{NodeID: targetNode, Version: 0}
@ -1141,6 +1143,7 @@ func (suite *TaskSuite) TestSegmentTaskStale() {
ID: targetNode, ID: targetNode,
CollectionID: suite.collection, CollectionID: suite.collection,
Segments: map[int64]*querypb.SegmentDist{}, Segments: map[int64]*querypb.SegmentDist{},
Channel: channel.ChannelName,
} }
for _, segment := range suite.loadSegments[1:] { for _, segment := range suite.loadSegments[1:] {
view.Segments[segment] = &querypb.SegmentDist{NodeID: targetNode, Version: 0} view.Segments[segment] = &querypb.SegmentDist{NodeID: targetNode, Version: 0}