diff --git a/internal/querycoordv2/meta/coordinator_broker.go b/internal/querycoordv2/meta/coordinator_broker.go index 8b454e00938d..b5b606b81697 100644 --- a/internal/querycoordv2/meta/coordinator_broker.go +++ b/internal/querycoordv2/meta/coordinator_broker.go @@ -112,14 +112,17 @@ func (broker *CoordinatorBroker) GetCollectionLoadInfo(ctx context.Context, coll return nil, 0, err } - log.Info("collection props", zap.Any("xxx", collectionInfo.GetProperties())) replicaNum, err := common.CollectionLevelReplicaNumber(collectionInfo.GetProperties()) - if replicaNum > 0 { + if err != nil { + log.Warn("failed to get collection level load info", zap.Int64("collectionID", collectionID), zap.Error(err)) + } else if replicaNum > 0 { log.Info("get collection level load info", zap.Int64("collectionID", collectionID), zap.Int64("replica_num", replicaNum)) } rgs, err := common.CollectionLevelResourceGroups(collectionInfo.GetProperties()) - if len(rgs) > 0 { + if err != nil { + log.Warn("failed to get collection level load info", zap.Int64("collectionID", collectionID), zap.Error(err)) + } else if len(rgs) > 0 { log.Info("get collection level load info", zap.Int64("collectionID", collectionID), zap.Strings("resource_groups", rgs)) } @@ -128,19 +131,21 @@ func (broker *CoordinatorBroker) GetCollectionLoadInfo(ctx context.Context, coll if err != nil { return nil, 0, err } - log.Info("database props", zap.Any("xxx", dbInfo.GetProperties())) - log.Info("xxx", zap.Int64("replicaNumber", replicaNum)) - log.Info("xxx", zap.Strings("rgs", rgs)) + if replicaNum <= 0 { replicaNum, err = common.DatabaseLevelReplicaNumber(dbInfo.GetProperties()) - if replicaNum > 0 { + if err != nil { + log.Warn("failed to get database level load info", zap.Int64("collectionID", collectionID), zap.Error(err)) + } else if replicaNum > 0 { log.Info("get database level load info", zap.Int64("collectionID", collectionID), zap.Int64("replica_num", replicaNum)) } } if len(rgs) == 0 { rgs, err = common.DatabaseLevelResourceGroups(dbInfo.GetProperties()) - if len(rgs) > 0 { + if err != nil { + log.Warn("failed to get database level load info", zap.Int64("collectionID", collectionID), zap.Error(err)) + } else if len(rgs) > 0 { log.Info("get database level load info", zap.Int64("collectionID", collectionID), zap.Strings("resource_groups", rgs)) } } diff --git a/internal/querycoordv2/meta/coordinator_broker_test.go b/internal/querycoordv2/meta/coordinator_broker_test.go index 778268f7ce66..dbecfc20a26c 100644 --- a/internal/querycoordv2/meta/coordinator_broker_test.go +++ b/internal/querycoordv2/meta/coordinator_broker_test.go @@ -572,7 +572,7 @@ func (s *CoordinatorBrokerRootCoordSuite) TestGetCollectionLoadInfo() { Properties: []*commonpb.KeyValuePair{}, }, nil) _, _, err := s.broker.GetCollectionLoadInfo(ctx, 1) - s.Error(err) + s.NoError(err) s.resetMock() }) }