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

[CP] fix server_cpu_quota_max/server_cpu_quota_min modification not effective

Browse Source
This commit is contained in:
zhjc1124
2023-09-20 17:32:29 +00:00
committed by ob-robot
parent d69d85f9e6
commit 789419e6cf
2 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/observer/ob_server.cpp
View File

@ -1092,18 +1092,9 @@ int ObServer::start()
int ObServer::try_create_hidden_sys() int ObServer::try_create_hidden_sys()
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
const uint64_t tenant_id = OB_SYS_TENANT_ID; if (OB_FAIL(multi_tenant_.create_hidden_sys_tenant())) {
omt::ObTenant *tenant; LOG_ERROR("fail to create hidden sys tenant", KR(ret));
if (OB_FAIL(multi_tenant_.get_tenant(tenant_id, tenant))) {
ret = OB_SUCCESS;
if (OB_FAIL(multi_tenant_.create_hidden_sys_tenant())) {
LOG_ERROR("fail to create hidden sys tenant", KR(ret));
}
LOG_INFO("finish create hidden sys", KR(ret));
} else {
LOG_INFO("sys tenant has been created, no need create hidden sys");
} }
return ret; return ret;
} }

20
src/observer/omt/ob_multi_tenant.cpp
View File

@ -683,14 +683,26 @@ int ObMultiTenant::create_hidden_sys_tenant()
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
const uint64_t tenant_id = OB_SYS_TENANT_ID; const uint64_t tenant_id = OB_SYS_TENANT_ID;
omt::ObTenant *tenant;
ObTenantMeta meta; ObTenantMeta meta;
if (OB_FAIL(construct_meta_for_hidden_sys(meta))) { if (OB_FAIL(construct_meta_for_hidden_sys(meta))) {
LOG_ERROR("fail to construct meta", K(ret)); LOG_ERROR("fail to construct meta", K(ret));
} else if (OB_FAIL(create_tenant(meta, true/* write_slog*/))) { } else {
LOG_ERROR("create hidden sys tenant failed", K(ret)); if (OB_FAIL(get_tenant(tenant_id, tenant))) {
ret = OB_SUCCESS;
if (OB_FAIL(create_tenant(meta, true/* write_slog */))) {
LOG_ERROR("create hidden sys tenant failed", K(ret));
}
LOG_INFO("finish create hidden sys", KR(ret));
} else if(tenant->is_hidden()){
if (OB_SUCC(ret) && !(meta.unit_ == tenant->get_unit())) {
if (OB_FAIL(GCTX.omt_->update_tenant_unit_no_lock(meta.unit_))) {
LOG_WARN("fail to update tenant unit", K(ret), K(tenant_id));
}
}
LOG_INFO("sys tenant has been created, no need create hidden sys");
}
} }
return ret; return ret;
} }