diff --git a/internal/distributed/datacoord/client/client.go b/internal/distributed/datacoord/client/client.go index 18de3ea86dd736fb6798aebd979f6f668db619a0..096b68b7a96abf10655769512807a6c6c551d71f 100644 --- a/internal/distributed/datacoord/client/client.go +++ b/internal/distributed/datacoord/client/client.go @@ -35,7 +35,7 @@ import ( "github.com/milvus-io/milvus/internal/util/typeutil" ) -var Params paramtable.GrpcClientConfig +var ClientParams paramtable.GrpcClientConfig // Client is the datacoord grpc client type Client struct { @@ -51,11 +51,11 @@ func NewClient(ctx context.Context, metaRoot string, etcdEndpoints []string) (*C log.Debug("DataCoordClient NewClient failed", zap.Error(err)) return nil, err } - Params.InitOnce(typeutil.DataCoordRole) + ClientParams.InitOnce(typeutil.DataCoordRole) client := &Client{ grpcClient: &grpcclient.ClientBase{ - ClientMaxRecvSize: Params.ClientMaxRecvSize, - ClientMaxSendSize: Params.ClientMaxSendSize, + ClientMaxRecvSize: ClientParams.ClientMaxRecvSize, + ClientMaxSendSize: ClientParams.ClientMaxSendSize, }, sess: sess, } diff --git a/internal/distributed/datanode/client/client.go b/internal/distributed/datanode/client/client.go index 84221eaf251263f0027f3a9d863c8f80f29a267a..15375cdd650f73c0567b89bd79bb31d55dd25657 100644 --- a/internal/distributed/datanode/client/client.go +++ b/internal/distributed/datanode/client/client.go @@ -32,7 +32,7 @@ import ( "github.com/milvus-io/milvus/internal/util/typeutil" ) -var Params paramtable.GrpcClientConfig +var ClientParams paramtable.GrpcClientConfig // Client is the grpc client for DataNode type Client struct { @@ -45,12 +45,12 @@ func NewClient(ctx context.Context, addr string) (*Client, error) { if addr == "" { return nil, fmt.Errorf("address is empty") } - Params.InitOnce(typeutil.DataNodeRole) + ClientParams.InitOnce(typeutil.DataNodeRole) client := &Client{ addr: addr, grpcClient: &grpcclient.ClientBase{ - ClientMaxRecvSize: Params.ClientMaxRecvSize, - ClientMaxSendSize: Params.ClientMaxSendSize, + ClientMaxRecvSize: ClientParams.ClientMaxRecvSize, + ClientMaxSendSize: ClientParams.ClientMaxSendSize, }, } client.grpcClient.SetRole(typeutil.DataNodeRole) diff --git a/internal/distributed/indexcoord/client/client.go b/internal/distributed/indexcoord/client/client.go index b2e29abbe469c568347b3bb57da4e395f57f2c45..cc47f2f1a4786264cd9dd94db8e15ba34f56e80b 100644 --- a/internal/distributed/indexcoord/client/client.go +++ b/internal/distributed/indexcoord/client/client.go @@ -35,7 +35,7 @@ import ( "github.com/milvus-io/milvus/internal/util/typeutil" ) -var Params paramtable.GrpcClientConfig +var ClientParams paramtable.GrpcClientConfig // Client is the grpc client of IndexCoord. type Client struct { @@ -51,11 +51,11 @@ func NewClient(ctx context.Context, metaRoot string, etcdEndpoints []string) (*C log.Debug("IndexCoordClient NewClient failed", zap.Error(err)) return nil, err } - Params.InitOnce(typeutil.IndexCoordRole) + ClientParams.InitOnce(typeutil.IndexCoordRole) client := &Client{ grpcClient: &grpcclient.ClientBase{ - ClientMaxRecvSize: Params.ClientMaxRecvSize, - ClientMaxSendSize: Params.ClientMaxSendSize, + ClientMaxRecvSize: ClientParams.ClientMaxRecvSize, + ClientMaxSendSize: ClientParams.ClientMaxSendSize, }, sess: sess, } diff --git a/internal/distributed/indexcoord/client/client_test.go b/internal/distributed/indexcoord/client/client_test.go index 90b6ef10e3bd06eba6ab8966ad6b85c0b3efe032..61642a5149d3f6f37c13f65a10787f6ec2862bf4 100644 --- a/internal/distributed/indexcoord/client/client_test.go +++ b/internal/distributed/indexcoord/client/client_test.go @@ -31,7 +31,7 @@ import ( ) func TestIndexCoordClient(t *testing.T) { - Params.InitOnce(typeutil.IndexCoordRole) + ClientParams.InitOnce(typeutil.IndexCoordRole) ctx := context.Background() server, err := grpcindexcoord.NewServer(ctx) assert.Nil(t, err) diff --git a/internal/distributed/indexnode/client/client.go b/internal/distributed/indexnode/client/client.go index 77f06cc32cc93e440c2829f797395d4e80e99f7a..a62bbb12b58d5c6a9658c12fbf06f7894aeeb6e5 100644 --- a/internal/distributed/indexnode/client/client.go +++ b/internal/distributed/indexnode/client/client.go @@ -31,7 +31,7 @@ import ( "google.golang.org/grpc" ) -var Params paramtable.GrpcClientConfig +var ClientParams paramtable.GrpcClientConfig // Client is the grpc client of IndexNode. type Client struct { @@ -44,12 +44,12 @@ func NewClient(ctx context.Context, addr string) (*Client, error) { if addr == "" { return nil, fmt.Errorf("address is empty") } - Params.InitOnce(typeutil.IndexNodeRole) + ClientParams.InitOnce(typeutil.IndexNodeRole) client := &Client{ addr: addr, grpcClient: &grpcclient.ClientBase{ - ClientMaxRecvSize: Params.ClientMaxRecvSize, - ClientMaxSendSize: Params.ClientMaxSendSize, + ClientMaxRecvSize: ClientParams.ClientMaxRecvSize, + ClientMaxSendSize: ClientParams.ClientMaxSendSize, }, } client.grpcClient.SetRole(typeutil.IndexNodeRole) diff --git a/internal/distributed/indexnode/client/client_test.go b/internal/distributed/indexnode/client/client_test.go index c89f525d62458bc92d155f60be9e75640bda6a6c..0565eaa725f75c84047993c23f36fd3c0830c9ab 100644 --- a/internal/distributed/indexnode/client/client_test.go +++ b/internal/distributed/indexnode/client/client_test.go @@ -21,21 +21,20 @@ import ( "errors" "testing" - "github.com/milvus-io/milvus/internal/util/metricsinfo" - - "github.com/milvus-io/milvus/internal/util/mock" - "google.golang.org/grpc" - grpcindexnode "github.com/milvus-io/milvus/internal/distributed/indexnode" "github.com/milvus-io/milvus/internal/indexnode" "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/proto/internalpb" + "github.com/milvus-io/milvus/internal/util/metricsinfo" + "github.com/milvus-io/milvus/internal/util/mock" + "github.com/milvus-io/milvus/internal/util/typeutil" "github.com/stretchr/testify/assert" + "google.golang.org/grpc" ) func Test_NewClient(t *testing.T) { - Params.Init() + ClientParams.InitOnce(typeutil.IndexNodeRole) ctx := context.Background() client, err := NewClient(ctx, "") assert.Nil(t, client) diff --git a/internal/distributed/proxy/client/client.go b/internal/distributed/proxy/client/client.go index 224712e64e41784f32fd84f3ba266dd9479afdf8..b2dcd3cf0600d3f396f5baa475e88f1108b144ee 100644 --- a/internal/distributed/proxy/client/client.go +++ b/internal/distributed/proxy/client/client.go @@ -31,7 +31,7 @@ import ( "google.golang.org/grpc" ) -var Params paramtable.GrpcClientConfig +var ClientParams paramtable.GrpcClientConfig // Client is the grpc client for Proxy type Client struct { @@ -44,12 +44,12 @@ func NewClient(ctx context.Context, addr string) (*Client, error) { if addr == "" { return nil, fmt.Errorf("address is empty") } - Params.InitOnce(typeutil.ProxyRole) + ClientParams.InitOnce(typeutil.ProxyRole) client := &Client{ addr: addr, grpcClient: &grpcclient.ClientBase{ - ClientMaxRecvSize: Params.ClientMaxRecvSize, - ClientMaxSendSize: Params.ClientMaxSendSize, + ClientMaxRecvSize: ClientParams.ClientMaxRecvSize, + ClientMaxSendSize: ClientParams.ClientMaxSendSize, }, } client.grpcClient.SetRole(typeutil.ProxyRole) diff --git a/internal/distributed/querycoord/client/client.go b/internal/distributed/querycoord/client/client.go index a90d2af59b4d58789a5d49f3ad283008b8951b1b..11bbc30e54262e4d90602a1a0cd2387466437352 100644 --- a/internal/distributed/querycoord/client/client.go +++ b/internal/distributed/querycoord/client/client.go @@ -34,7 +34,7 @@ import ( "google.golang.org/grpc" ) -var Params paramtable.GrpcClientConfig +var ClientParams paramtable.GrpcClientConfig // Client is the grpc client of QueryCoord. type Client struct { @@ -50,11 +50,11 @@ func NewClient(ctx context.Context, metaRoot string, etcdEndpoints []string) (*C log.Debug("QueryCoordClient NewClient failed", zap.Error(err)) return nil, err } - Params.InitOnce(typeutil.QueryCoordRole) + ClientParams.InitOnce(typeutil.QueryCoordRole) client := &Client{ grpcClient: &grpcclient.ClientBase{ - ClientMaxRecvSize: Params.ClientMaxRecvSize, - ClientMaxSendSize: Params.ClientMaxSendSize, + ClientMaxRecvSize: ClientParams.ClientMaxRecvSize, + ClientMaxSendSize: ClientParams.ClientMaxSendSize, }, sess: sess, } diff --git a/internal/distributed/querynode/client/client.go b/internal/distributed/querynode/client/client.go index 3939bdc63a3854026db8649611b368d17df3f286..cff5ba7dbc428c13ebaa79a5248be69abff28cef 100644 --- a/internal/distributed/querynode/client/client.go +++ b/internal/distributed/querynode/client/client.go @@ -31,7 +31,7 @@ import ( "google.golang.org/grpc" ) -var Params paramtable.GrpcClientConfig +var ClientParams paramtable.GrpcClientConfig // Client is the grpc client of QueryNode. type Client struct { @@ -44,12 +44,12 @@ func NewClient(ctx context.Context, addr string) (*Client, error) { if addr == "" { return nil, fmt.Errorf("addr is empty") } - Params.InitOnce(typeutil.QueryNodeRole) + ClientParams.InitOnce(typeutil.QueryNodeRole) client := &Client{ addr: addr, grpcClient: &grpcclient.ClientBase{ - ClientMaxRecvSize: Params.ClientMaxRecvSize, - ClientMaxSendSize: Params.ClientMaxSendSize, + ClientMaxRecvSize: ClientParams.ClientMaxRecvSize, + ClientMaxSendSize: ClientParams.ClientMaxSendSize, }, } client.grpcClient.SetRole(typeutil.QueryNodeRole) diff --git a/internal/distributed/querynode/client/client_test.go b/internal/distributed/querynode/client/client_test.go index 15e0033630b3d7efa63e3099ec8926bc9ae8048c..9dfb03f1bb08c02f755d0957ab48e9160ff0dab8 100644 --- a/internal/distributed/querynode/client/client_test.go +++ b/internal/distributed/querynode/client/client_test.go @@ -21,11 +21,11 @@ import ( "errors" "testing" - "github.com/milvus-io/milvus/internal/util/mock" - "google.golang.org/grpc" - "github.com/milvus-io/milvus/internal/proxy" + "github.com/milvus-io/milvus/internal/util/mock" + "github.com/milvus-io/milvus/internal/util/typeutil" "github.com/stretchr/testify/assert" + "google.golang.org/grpc" ) func Test_NewClient(t *testing.T) { @@ -40,7 +40,7 @@ func Test_NewClient(t *testing.T) { assert.Nil(t, err) assert.NotNil(t, client) - Params.Init() + ClientParams.InitOnce(typeutil.QueryNodeRole) err = client.Start() assert.Nil(t, err) diff --git a/internal/distributed/rootcoord/client/client.go b/internal/distributed/rootcoord/client/client.go index 6ceffd45fd282fee080ee78b77743c8243104f51..c0177e37e8cc6ebda765251ad1a7f72fcc60c99f 100644 --- a/internal/distributed/rootcoord/client/client.go +++ b/internal/distributed/rootcoord/client/client.go @@ -36,7 +36,7 @@ import ( "google.golang.org/grpc" ) -var Params paramtable.GrpcClientConfig +var ClientParams paramtable.GrpcClientConfig // Client grpc client type Client struct { @@ -56,11 +56,11 @@ func NewClient(ctx context.Context, metaRoot string, etcdEndpoints []string) (*C log.Debug("QueryCoordClient NewClient failed", zap.Error(err)) return nil, err } - Params.InitOnce(typeutil.RootCoordRole) + ClientParams.InitOnce(typeutil.RootCoordRole) client := &Client{ grpcClient: &grpcclient.ClientBase{ - ClientMaxRecvSize: Params.ClientMaxRecvSize, - ClientMaxSendSize: Params.ClientMaxSendSize, + ClientMaxRecvSize: ClientParams.ClientMaxRecvSize, + ClientMaxSendSize: ClientParams.ClientMaxSendSize, }, sess: sess, }