From d433e95ce0ad8dcc4a0da01ec149c5ce21eedc56 Mon Sep 17 00:00:00 2001 From: wei liu Date: Mon, 27 Feb 2023 19:29:47 +0800 Subject: [PATCH] fix transfer node meta err (#22420) Signed-off-by: Wei Liu --- internal/querycoordv2/meta/resource_manager.go | 2 +- internal/querycoordv2/meta/resource_manager_test.go | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/internal/querycoordv2/meta/resource_manager.go b/internal/querycoordv2/meta/resource_manager.go index 21e4b4c7f4..1c75762f6d 100644 --- a/internal/querycoordv2/meta/resource_manager.go +++ b/internal/querycoordv2/meta/resource_manager.go @@ -591,7 +591,7 @@ func (rm *ResourceManager) transferNodeInStore(from string, to string, numNode i } toCapacity := rm.groups[to].GetCapacity() - if from != DefaultResourceGroupName { + if to != DefaultResourceGroupName { // default rg capacity won't be changed toCapacity = rm.groups[to].GetCapacity() + numNode } diff --git a/internal/querycoordv2/meta/resource_manager_test.go b/internal/querycoordv2/meta/resource_manager_test.go index 3bfc6f8a19..cb2645bbf7 100644 --- a/internal/querycoordv2/meta/resource_manager_test.go +++ b/internal/querycoordv2/meta/resource_manager_test.go @@ -196,8 +196,10 @@ func (suite *ResourceManagerSuite) TestRecover() { err = suite.manager.AddResourceGroup("rg2") suite.NoError(err) - suite.manager.AssignNode("rg1", 1) - suite.manager.AssignNode("rg2", 2) + suite.manager.AssignNode(DefaultResourceGroupName, 1) + suite.manager.TransferNode(DefaultResourceGroupName, "rg1", 1) + suite.manager.AssignNode(DefaultResourceGroupName, 2) + suite.manager.TransferNode(DefaultResourceGroupName, "rg2", 1) suite.manager.AssignNode(DefaultResourceGroupName, 3) suite.manager.AssignNode(DefaultResourceGroupName, 4) @@ -214,7 +216,6 @@ func (suite *ResourceManagerSuite) TestRecover() { suite.NoError(err) suite.Equal(1, rg.GetCapacity()) suite.True(suite.manager.ContainsNode("rg1", 1)) - print(suite.manager.GetNodes("rg1")) rg, err = suite.manager.GetResourceGroup("rg2") suite.NoError(err)