hcq/oceanbase
hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix return code overlap in ObTenant::init

Browse Source
This commit is contained in:
nroskill 2023-03-02 17:33:48 +00:00 committed by ob-robot
parent baa7cdab80
commit 123a926c46
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/observer/omt/ob_tenant.cpp
View File

@ -328,7 +328,6 @@ void ObResourceGroup::update_queue_size()
int ObResourceGroup::acquire_more_worker(int64_t num, int64_t &succ_num)
{
int ret = OB_SUCCESS;
int tmp_ret = OB_SUCCESS;
ObTenantSwitchGuard guard(tenant_);
const auto need_num = num;
@ -647,10 +646,15 @@ int ObTenant::init(const ObTenantMeta &meta)
// do nothing
} else if (OB_FAIL(OB_PX_TARGET_MGR.add_tenant(id_))) {
LOG_WARN("add tenant into px target mgr failed", K(ret), K(id_));
} else if (OB_FAIL(G_RES_MGR.get_col_mapping_rule_mgr().add_tenant(id_))) {
LOG_WARN("add tenant into res col maping rule mgr failed", K(ret), K(id_));
}
} else {
disable_user_sched(); // disable_user_sched for virtual tenant
}
}
if (OB_SUCC(ret)) {
int64_t succ_cnt = 0L;
if (OB_FAIL(acquire_more_worker(2, succ_cnt))) {
LOG_WARN("create worker in init failed", K(ret), K(succ_cnt));
@ -667,13 +671,6 @@ int ObTenant::init(const ObTenantMeta &meta)
timeup();
}
}
if (OB_SUCC(ret) && !is_virtual_tenant_id(id_)) {
if (OB_FAIL(OB_PX_TARGET_MGR.add_tenant(id_))) {
LOG_WARN("add tenant into px target mgr failed", K(ret), K(id_));
} else if (OB_FAIL(G_RES_MGR.get_col_mapping_rule_mgr().add_tenant(id_))) {
LOG_WARN("add tenant into res col maping rule mgr failed", K(ret), K(id_));
}
}
if (OB_FAIL(ret)) {
LOG_ERROR("fail to create tenant module", K(ret));