From 5da6aade024fe7b712479665f594bf258b3db8db Mon Sep 17 00:00:00 2001 From: wei liu Date: Mon, 6 Feb 2023 15:55:56 +0800 Subject: [PATCH] fix default capacity of default rg (#21965) Signed-off-by: Wei Liu --- internal/querycoordv2/meta/resource_manager.go | 6 +++--- internal/querycoordv2/meta/resource_manager_test.go | 6 ++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/internal/querycoordv2/meta/resource_manager.go b/internal/querycoordv2/meta/resource_manager.go index f6dd8a3861..61d7dd47f3 100644 --- a/internal/querycoordv2/meta/resource_manager.go +++ b/internal/querycoordv2/meta/resource_manager.go @@ -140,7 +140,7 @@ type ResourceManager struct { func NewResourceManager(store Store, nodeMgr *session.NodeManager) *ResourceManager { groupMap := make(map[string]*ResourceGroup) - groupMap[DefaultResourceGroupName] = NewResourceGroup(1000000) + groupMap[DefaultResourceGroupName] = NewResourceGroup(0) return &ResourceManager{ groups: groupMap, store: store, @@ -459,8 +459,8 @@ func (rm *ResourceManager) HandleNodeUp(node int64) (string, error) { return rgName, nil } - // add new node to default rg - rm.groups[DefaultResourceGroupName].handleNodeUp(node) + // assign new node to default rg + rm.groups[DefaultResourceGroupName].assignNode(node) log.Info("HandleNodeUp: assign node to default resource group", zap.String("rgName", DefaultResourceGroupName), zap.Int64("node", node), diff --git a/internal/querycoordv2/meta/resource_manager_test.go b/internal/querycoordv2/meta/resource_manager_test.go index e48b152efc..1bc46a3f80 100644 --- a/internal/querycoordv2/meta/resource_manager_test.go +++ b/internal/querycoordv2/meta/resource_manager_test.go @@ -153,16 +153,14 @@ func (suite *ResourceManagerSuite) TestHandleNodeUp() { suite.NoError(err) defaultRG, err := suite.manager.GetResourceGroup(DefaultResourceGroupName) suite.NoError(err) - oldNodesNum := len(defaultRG.GetNodes()) + suite.Equal(0, defaultRG.GetCapacity()) suite.manager.HandleNodeUp(101) rg, err = suite.manager.GetResourceGroup("rg1") suite.NoError(err) suite.Equal(rg.GetCapacity(), 3) suite.Equal(len(rg.GetNodes()), 2) suite.False(suite.manager.ContainsNode("rg1", 101)) - nodes, err := suite.manager.GetNodes(DefaultResourceGroupName) - suite.NoError(err) - suite.Equal(len(nodes), oldNodesNum+1) + suite.Equal(1, defaultRG.GetCapacity()) } func (suite *ResourceManagerSuite) TestRecover() {