mirror of
https://gitee.com/milvus-io/milvus.git
synced 2025-12-07 01:28:27 +08:00
Cherry-pick from master pr: #45018 #45030 Related to #44761 Refactor proxy shard client management by creating a new internal/proxy/shardclient package. This improves code organization and modularity by: - Moving load balancing logic (LookAsideBalancer, RoundRobinBalancer) to shardclient package - Extracting shard client manager and related interfaces into separate package - Relocating shard leader management and client lifecycle code - Adding package documentation (README.md, OWNERS) - Updating proxy code to use the new shardclient package interfaces This change makes the shard client functionality more maintainable and better encapsulated, reducing coupling in the proxy layer. Also consolidates the proxy package's mockery generation to use a centralized `.mockery.yaml` configuration file, aligning with the pattern used by other packages like querycoordv2. Changes - **Makefile**: Replace multiple individual mockery commands with a single config-based invocation for `generate-mockery-proxy` target - **internal/proxy/.mockery.yaml**: Add mockery configuration defining all mock interfaces for proxy and proxy/shardclient packages - **Mock files**: Regenerate mocks using the new configuration: - `mock_cache.go`: Clean up by removing unused interface methods (credential, shard cache, policy methods) - `shardclient/mock_lb_balancer.go`: Update type comments (nodeInfo → NodeInfo) - `shardclient/mock_lb_policy.go`: Update formatting - `shardclient/mock_shardclient_manager.go`: Fix parameter naming consistency (nodeInfo1 → nodeInfo) - **task_search_test.go**: Remove obsolete mock expectations for deprecated cache methods Benefits - Centralized mockery configuration for easier maintenance - Consistent with other packages (querycoordv2, etc.) - Cleaner mock interfaces by removing unused methods - Better type consistency in generated mocks --------- Signed-off-by: Congqi Xia <congqi.xia@zilliz.com>
246 lines
7.7 KiB
Go
246 lines
7.7 KiB
Go
// Licensed to the LF AI & Data foundation under one
|
|
// or more contributor license agreements. See the NOTICE file
|
|
// distributed with this work for additional information
|
|
// regarding copyright ownership. The ASF licenses this file
|
|
// to you under the Apache License, Version 2.0 (the
|
|
// "License"); you may not use this file except in compliance
|
|
// with the License. You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
package proxy
|
|
|
|
import (
|
|
"context"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/stretchr/testify/mock"
|
|
"github.com/stretchr/testify/suite"
|
|
"google.golang.org/grpc"
|
|
"google.golang.org/protobuf/proto"
|
|
|
|
"github.com/milvus-io/milvus-proto/go-api/v2/commonpb"
|
|
"github.com/milvus-io/milvus-proto/go-api/v2/milvuspb"
|
|
"github.com/milvus-io/milvus-proto/go-api/v2/schemapb"
|
|
"github.com/milvus-io/milvus/internal/mocks"
|
|
"github.com/milvus-io/milvus/internal/proxy/shardclient"
|
|
"github.com/milvus-io/milvus/internal/types"
|
|
"github.com/milvus-io/milvus/pkg/v2/common"
|
|
"github.com/milvus-io/milvus/pkg/v2/proto/internalpb"
|
|
"github.com/milvus-io/milvus/pkg/v2/proto/querypb"
|
|
"github.com/milvus-io/milvus/pkg/v2/util/merr"
|
|
"github.com/milvus-io/milvus/pkg/v2/util/paramtable"
|
|
"github.com/milvus-io/milvus/pkg/v2/util/typeutil"
|
|
)
|
|
|
|
type StatisticTaskSuite struct {
|
|
suite.Suite
|
|
mixc types.MixCoordClient
|
|
qn *mocks.MockQueryNodeClient
|
|
|
|
lb shardclient.LBPolicy
|
|
mgr shardclient.ShardClientMgr
|
|
|
|
collectionName string
|
|
collectionID int64
|
|
}
|
|
|
|
func (s *StatisticTaskSuite) SetupSuite() {
|
|
paramtable.Init()
|
|
}
|
|
|
|
func (s *StatisticTaskSuite) SetupTest() {
|
|
successStatus := commonpb.Status{ErrorCode: commonpb.ErrorCode_Success}
|
|
mixc := NewMixCoordMock()
|
|
|
|
mixc.GetShardLeadersFunc = func(ctx context.Context, req *querypb.GetShardLeadersRequest, opts ...grpc.CallOption) (*querypb.GetShardLeadersResponse, error) {
|
|
return &querypb.GetShardLeadersResponse{
|
|
Status: &successStatus,
|
|
Shards: []*querypb.ShardLeadersList{
|
|
{
|
|
ChannelName: "channel-1",
|
|
NodeIds: []int64{1, 2, 3},
|
|
NodeAddrs: []string{"localhost:9000", "localhost:9001", "localhost:9002"},
|
|
Serviceable: []bool{true, true, true},
|
|
},
|
|
},
|
|
}, nil
|
|
}
|
|
|
|
mixc.ShowLoadPartitionsFunc = func(ctx context.Context, req *querypb.ShowPartitionsRequest, opts ...grpc.CallOption) (*querypb.ShowPartitionsResponse, error) {
|
|
return &querypb.ShowPartitionsResponse{
|
|
Status: &successStatus,
|
|
PartitionIDs: []int64{1, 2, 3},
|
|
}, nil
|
|
}
|
|
|
|
s.mixc = mixc
|
|
s.qn = mocks.NewMockQueryNodeClient(s.T())
|
|
|
|
s.qn.EXPECT().GetComponentStates(mock.Anything, mock.Anything).Return(nil, nil).Maybe()
|
|
mgr := shardclient.NewMockShardClientManager(s.T())
|
|
mgr.EXPECT().GetClient(mock.Anything, mock.Anything).Return(s.qn, nil).Maybe()
|
|
mgr.EXPECT().GetShardLeaderList(mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return([]string{"mock_qn"}, nil).Maybe()
|
|
mgr.EXPECT().GetShard(mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return([]shardclient.NodeInfo{
|
|
{NodeID: 1, Address: "mock_qn", Serviceable: true},
|
|
}, nil).Maybe()
|
|
mgr.EXPECT().DeprecateShardCache(mock.Anything, mock.Anything).Return().Maybe()
|
|
s.mgr = mgr
|
|
s.lb = shardclient.NewLBPolicyImpl(mgr)
|
|
|
|
err := InitMetaCache(context.Background(), s.mixc)
|
|
s.NoError(err)
|
|
|
|
s.collectionName = "test_statistics_task"
|
|
s.loadCollection()
|
|
}
|
|
|
|
func (s *StatisticTaskSuite) loadCollection() {
|
|
fieldName2Types := map[string]schemapb.DataType{
|
|
testBoolField: schemapb.DataType_Bool,
|
|
testInt32Field: schemapb.DataType_Int32,
|
|
testInt64Field: schemapb.DataType_Int64,
|
|
testFloatField: schemapb.DataType_Float,
|
|
testDoubleField: schemapb.DataType_Double,
|
|
testFloatVecField: schemapb.DataType_FloatVector,
|
|
}
|
|
if enableMultipleVectorFields {
|
|
fieldName2Types[testBinaryVecField] = schemapb.DataType_BinaryVector
|
|
}
|
|
|
|
schema := constructCollectionSchemaByDataType(s.collectionName, fieldName2Types, testInt64Field, false)
|
|
marshaledSchema, err := proto.Marshal(schema)
|
|
s.NoError(err)
|
|
|
|
ctx := context.Background()
|
|
createColT := &createCollectionTask{
|
|
Condition: NewTaskCondition(ctx),
|
|
CreateCollectionRequest: &milvuspb.CreateCollectionRequest{
|
|
CollectionName: s.collectionName,
|
|
Schema: marshaledSchema,
|
|
ShardsNum: common.DefaultShardsNum,
|
|
},
|
|
ctx: ctx,
|
|
mixCoord: s.mixc,
|
|
}
|
|
|
|
s.NoError(createColT.OnEnqueue())
|
|
s.NoError(createColT.PreExecute(ctx))
|
|
s.NoError(createColT.Execute(ctx))
|
|
s.NoError(createColT.PostExecute(ctx))
|
|
|
|
collectionID, err := globalMetaCache.GetCollectionID(ctx, GetCurDBNameFromContextOrDefault(ctx), s.collectionName)
|
|
s.NoError(err)
|
|
|
|
status, err := s.mixc.LoadCollection(ctx, &querypb.LoadCollectionRequest{
|
|
Base: &commonpb.MsgBase{
|
|
MsgType: commonpb.MsgType_LoadCollection,
|
|
SourceID: paramtable.GetNodeID(),
|
|
},
|
|
CollectionID: collectionID,
|
|
})
|
|
s.NoError(err)
|
|
s.Equal(commonpb.ErrorCode_Success, status.ErrorCode)
|
|
s.collectionID = collectionID
|
|
}
|
|
|
|
func (s *StatisticTaskSuite) TearDownSuite() {
|
|
s.mixc.Close()
|
|
}
|
|
|
|
func (s *StatisticTaskSuite) TestStatisticTask_Timeout() {
|
|
ctx := context.Background()
|
|
task := s.getStatisticsTask(ctx)
|
|
|
|
s.NoError(task.OnEnqueue())
|
|
|
|
// test query task with timeout
|
|
ctx1, cancel1 := context.WithTimeout(ctx, 10*time.Second)
|
|
defer cancel1()
|
|
// before preExecute
|
|
s.Equal(typeutil.ZeroTimestamp, task.TimeoutTimestamp)
|
|
task.ctx = ctx1
|
|
s.NoError(task.PreExecute(ctx))
|
|
// after preExecute
|
|
s.Greater(task.TimeoutTimestamp, typeutil.ZeroTimestamp)
|
|
}
|
|
|
|
func (s *StatisticTaskSuite) getStatisticsTask(ctx context.Context) *getStatisticsTask {
|
|
return &getStatisticsTask{
|
|
Condition: NewTaskCondition(ctx),
|
|
ctx: ctx,
|
|
collectionName: s.collectionName,
|
|
result: &milvuspb.GetStatisticsResponse{
|
|
Status: merr.Success(),
|
|
},
|
|
request: &milvuspb.GetStatisticsRequest{
|
|
Base: &commonpb.MsgBase{
|
|
MsgType: commonpb.MsgType_Retrieve,
|
|
SourceID: paramtable.GetNodeID(),
|
|
},
|
|
CollectionName: s.collectionName,
|
|
},
|
|
mixc: s.mixc,
|
|
lb: s.lb,
|
|
shardclientMgr: s.mgr,
|
|
}
|
|
}
|
|
|
|
func (s *StatisticTaskSuite) TestStatisticTask_NotShardLeader() {
|
|
ctx := context.Background()
|
|
task := s.getStatisticsTask(ctx)
|
|
|
|
s.NoError(task.OnEnqueue())
|
|
|
|
task.fromQueryNode = true
|
|
s.qn.EXPECT().GetStatistics(mock.Anything, mock.Anything).Return(&internalpb.GetStatisticsResponse{
|
|
Status: &commonpb.Status{
|
|
ErrorCode: commonpb.ErrorCode_NotShardLeader,
|
|
Reason: "error",
|
|
},
|
|
}, nil)
|
|
s.NoError(task.PreExecute(ctx))
|
|
s.Error(task.Execute(ctx))
|
|
s.NoError(task.PostExecute(ctx))
|
|
}
|
|
|
|
func (s *StatisticTaskSuite) TestStatisticTask_UnexpectedError() {
|
|
ctx := context.Background()
|
|
task := s.getStatisticsTask(ctx)
|
|
s.NoError(task.OnEnqueue())
|
|
|
|
task.fromQueryNode = true
|
|
s.qn.EXPECT().GetStatistics(mock.Anything, mock.Anything).Return(&internalpb.GetStatisticsResponse{
|
|
Status: &commonpb.Status{
|
|
ErrorCode: commonpb.ErrorCode_UnexpectedError,
|
|
Reason: "error",
|
|
},
|
|
}, nil)
|
|
s.NoError(task.PreExecute(ctx))
|
|
s.Error(task.Execute(ctx))
|
|
s.NoError(task.PostExecute(ctx))
|
|
}
|
|
|
|
func (s *StatisticTaskSuite) TestStatisticTask_Success() {
|
|
ctx := context.Background()
|
|
task := s.getStatisticsTask(ctx)
|
|
|
|
s.NoError(task.OnEnqueue())
|
|
s.qn.EXPECT().GetStatistics(mock.Anything, mock.Anything).Return(nil, nil)
|
|
s.NoError(task.PreExecute(ctx))
|
|
task.fromQueryNode = true
|
|
task.fromDataCoord = false
|
|
s.NoError(task.Execute(ctx))
|
|
s.NoError(task.PostExecute(ctx))
|
|
}
|
|
|
|
func TestStatisticTaskSuite(t *testing.T) {
|
|
suite.Run(t, new(StatisticTaskSuite))
|
|
}
|