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 Handoff log in shardCluster service (#17039)

Browse Source 
Fix #17035

Signed-off-by: Congqi Xia <congqi.xia@zilliz.com>
This commit is contained in:
congqixia 2022-05-16 18:29:56 +08:00 committed by GitHub
parent 94f0951f0d
commit ffff291018
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/querynode/shard_cluster_service.go
View File

@ -152,7 +152,7 @@ func (s *ShardClusterService) HandoffVChannelSegments(vchannel string, info *que
} }
sc := raw.(*ShardCluster) sc := raw.(*ShardCluster)
err := sc.HandoffSegments(info) err := sc.HandoffSegments(info)
if err != nil { if err == nil {
log.Info("successfully handoff ", zap.String("channel", vchannel), zap.Any("segment", info)) log.Info("successfully handoff ", zap.String("channel", vchannel), zap.Any("segment", info))
} else { } else {
log.Warn("failed to handoff", zap.String("channel", vchannel), zap.Any("segment", info), zap.Error(err)) log.Warn("failed to handoff", zap.String("channel", vchannel), zap.Any("segment", info), zap.Error(err))

22
internal/querynode/shard_cluster_service_test.go
View File

@ -102,9 +102,25 @@ func TestShardClusterService_HandoffVChannelSegments(t *testing.T) {
assert.NoError(t, err) assert.NoError(t, err)
clusterService.addShardCluster(defaultCollectionID, defaultReplicaID, defaultDMLChannel) clusterService.addShardCluster(defaultCollectionID, defaultReplicaID, defaultDMLChannel)
//TODO change shardCluster to interface to mock test behavior //TODO change shardCluster to interface to mock test behavior
assert.NotPanics(t, func() { t.Run("normal case", func(t *testing.T) {
err = clusterService.HandoffVChannelSegments(defaultDMLChannel, &querypb.SegmentChangeInfo{}) assert.NotPanics(t, func() {
assert.NoError(t, err) err = clusterService.HandoffVChannelSegments(defaultDMLChannel, &querypb.SegmentChangeInfo{})
assert.NoError(t, err)
})
}) })
t.Run("error case", func(t *testing.T) {
assert.NotPanics(t, func() {
err = clusterService.HandoffVChannelSegments(defaultDMLChannel, &querypb.SegmentChangeInfo{
OfflineSegments: []*querypb.SegmentInfo{
{SegmentID: 1, NodeID: 3, CollectionID: defaultCollectionID, DmChannel: defaultDMLChannel, NodeIds: []UniqueID{3}},
},
})
assert.Error(t, err)
})
})
} }