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

Remove growing according to offline as well (#17968)

Browse Source 
Signed-off-by: Congqi Xia <congqi.xia@zilliz.com>
This commit is contained in:
congqixia 2022-06-30 20:14:19 +08:00 committed by GitHub
parent ee1ca4d21f
commit f4177f4434
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
internal/querynode/shard_cluster.go
View File

@ -32,6 +32,7 @@ import (
"github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/internalpb"
"github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/proto/querypb"
"github.com/milvus-io/milvus/internal/util/errorutil" "github.com/milvus-io/milvus/internal/util/errorutil"
"github.com/milvus-io/milvus/internal/util/typeutil"
) )
type shardClusterState int32 type shardClusterState int32
@ -611,15 +612,23 @@ func (sc *ShardCluster) HandoffSegments(info *querypb.SegmentChangeInfo) error {
// appendHandoff adds the change info into pending list and returns the token. // appendHandoff adds the change info into pending list and returns the token.
func (sc *ShardCluster) applySegmentChange(info *querypb.SegmentChangeInfo, onlineSegmentIDs []UniqueID) int64 { func (sc *ShardCluster) applySegmentChange(info *querypb.SegmentChangeInfo, onlineSegmentIDs []UniqueID) int64 {
// the suspects growing segment ids
// first all online segment shall be tried, for flush-handoff only puts segment in onlineSegments
// and we need to try all offlineSegments in case flush-compact-handoff case
possibleGrowingToRemove := make([]UniqueID, 0, len(info.OfflineSegments)+len(onlineSegmentIDs))
offlineSegments := typeutil.UniqueSet{} // map stores offline segment id for quick check
for _, offline := range info.OfflineSegments {
offlineSegments.Insert(offline.GetSegmentID())
possibleGrowingToRemove = append(possibleGrowingToRemove, offline.GetSegmentID())
}
// add online segment ids to suspect list
possibleGrowingToRemove = append(possibleGrowingToRemove, onlineSegmentIDs...)
// generate next version allocation // generate next version allocation
sc.mut.RLock() sc.mut.RLock()
allocations := sc.segments.Clone(func(segmentID int64) bool { allocations := sc.segments.Clone(func(segmentID int64) bool {
for _, offline := range info.OfflineSegments { return offlineSegments.Contain(segmentID)
if offline.GetSegmentID() == segmentID {
return true
}
}
return false
}) })
sc.mut.RUnlock() sc.mut.RUnlock()
@ -662,7 +671,7 @@ func (sc *ShardCluster) applySegmentChange(info *querypb.SegmentChangeInfo, onli
// error ignored here // error ignored here
sc.leader.client.ReleaseSegments(context.Background(), &querypb.ReleaseSegmentsRequest{ sc.leader.client.ReleaseSegments(context.Background(), &querypb.ReleaseSegmentsRequest{
CollectionID: sc.collectionID, CollectionID: sc.collectionID,
SegmentIDs: onlineSegmentIDs, SegmentIDs: possibleGrowingToRemove,
Scope: querypb.DataScope_Streaming, Scope: querypb.DataScope_Streaming,
}) })
} }