fix default capacity of default rg (#21965)

Signed-off-by: Wei Liu <wei.liu@zilliz.com>
pull/22021/head
wei liu 2023-02-06 15:55:56 +08:00 committed by GitHub
parent 73b6c13245
commit 5da6aade02
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 7 deletions

View File

@ -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),

View File

@ -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() {