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

fix: Remove segment from leader view can't be executed (#31663)

Browse Source 
issue: #31664

Signed-off-by: Wei Liu <wei.liu@zilliz.com>
This commit is contained in:
wei liu 2024-04-01 10:39:12 +08:00 committed by GitHub
parent c311932d5f
commit bb500d66c7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/querycoordv2/checkers/leader_checker.go
View File

@ -189,7 +189,9 @@ func (c *LeaderChecker) findNeedRemovedSegments(ctx context.Context, replica *me
log.Debug("leader checker append a segment to remove", log.Debug("leader checker append a segment to remove",
zap.Int64("segmentID", sid), zap.Int64("segmentID", sid),
zap.Int64("nodeID", s.NodeID)) zap.Int64("nodeID", s.NodeID))
action := task.NewLeaderAction(leaderView.ID, s.NodeID, task.ActionTypeReduce, leaderView.Channel, sid, 0) // reduce leader action won't be execute on worker, in order to remove segment from delegator success even when worker done
// set workerID to leader view's node
action := task.NewLeaderAction(leaderView.ID, leaderView.ID, task.ActionTypeReduce, leaderView.Channel, sid, 0)
t := task.NewLeaderTask( t := task.NewLeaderTask(
ctx, ctx,
paramtable.Get().QueryCoordCfg.SegmentTaskTimeout.GetAsDuration(time.Millisecond), paramtable.Get().QueryCoordCfg.SegmentTaskTimeout.GetAsDuration(time.Millisecond),

2
internal/querycoordv2/checkers/leader_checker_test.go
View File

@ -409,7 +409,7 @@ func (suite *LeaderCheckerTestSuite) TestSyncRemovedSegments() {
suite.Equal(tasks[0].ReplicaID(), int64(1)) suite.Equal(tasks[0].ReplicaID(), int64(1))
suite.Len(tasks[0].Actions(), 1) suite.Len(tasks[0].Actions(), 1)
suite.Equal(tasks[0].Actions()[0].Type(), task.ActionTypeReduce) suite.Equal(tasks[0].Actions()[0].Type(), task.ActionTypeReduce)
suite.Equal(tasks[0].Actions()[0].Node(), int64(1)) suite.Equal(tasks[0].Actions()[0].Node(), int64(2))
suite.Equal(tasks[0].Actions()[0].(*task.LeaderAction).SegmentID(), int64(3)) suite.Equal(tasks[0].Actions()[0].(*task.LeaderAction).SegmentID(), int64(3))
suite.Equal(tasks[0].Actions()[0].(*task.LeaderAction).Version(), int64(0)) suite.Equal(tasks[0].Actions()[0].(*task.LeaderAction).Version(), int64(0))
suite.Equal(tasks[0].Priority(), task.TaskPriorityLow) suite.Equal(tasks[0].Priority(), task.TaskPriorityLow)

3
internal/querynodev2/services.go
View File

@ -1425,9 +1425,10 @@ func (node *QueryNode) SyncDistribution(ctx context.Context, req *querypb.SyncDi
return merr.Status(err), nil return merr.Status(err), nil
} }
// in case of target node offline, when try to remove segment from leader's distribution, use wildcardNodeID(-1) to skip nodeID check
for _, action := range removeActions { for _, action := range removeActions {
shardDelegator.ReleaseSegments(ctx, &querypb.ReleaseSegmentsRequest{ shardDelegator.ReleaseSegments(ctx, &querypb.ReleaseSegmentsRequest{
NodeID: action.GetNodeID(), NodeID: -1,
SegmentIDs: []int64{action.GetSegmentID()}, SegmentIDs: []int64{action.GetSegmentID()},
Scope: querypb.DataScope_Historical, Scope: querypb.DataScope_Historical,
CollectionID: req.GetCollectionID(), CollectionID: req.GetCollectionID(),

4
internal/querynodev2/services_test.go
View File

@ -1920,7 +1920,7 @@ func (suite *ServiceSuite) TestSyncDistribution_ReleaseResultCheck() {
suite.NoError(err) suite.NoError(err)
suite.Equal(commonpb.ErrorCode_Success, status.ErrorCode) suite.Equal(commonpb.ErrorCode_Success, status.ErrorCode)
sealedSegments, _ = delegator.GetSegmentInfo(false) sealedSegments, _ = delegator.GetSegmentInfo(false)
suite.Len(sealedSegments[0].Segments, 4) suite.Len(sealedSegments[0].Segments, 3)
releaseAction = &querypb.SyncAction{ releaseAction = &querypb.SyncAction{
Type: querypb.SyncType_Remove, Type: querypb.SyncType_Remove,
@ -1934,7 +1934,7 @@ func (suite *ServiceSuite) TestSyncDistribution_ReleaseResultCheck() {
suite.NoError(err) suite.NoError(err)
suite.Equal(commonpb.ErrorCode_Success, status.ErrorCode) suite.Equal(commonpb.ErrorCode_Success, status.ErrorCode)
sealedSegments, _ = delegator.GetSegmentInfo(false) sealedSegments, _ = delegator.GetSegmentInfo(false)
suite.Len(sealedSegments[0].Segments, 3) suite.Len(sealedSegments[0].Segments, 2)
} }
func (suite *ServiceSuite) TestSyncDistribution_Failed() { func (suite *ServiceSuite) TestSyncDistribution_Failed() {