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

[CP] fix set group cpu quota error

Browse Source
This commit is contained in:
zhjc1124
2024-06-18 05:13:52 +00:00
committed by ob-robot
parent acdd042242
commit cf6beaf2be
2 changed files with 21 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
src/share/resource_manager/ob_resource_plan_manager.cpp
View File

@ -69,23 +69,6 @@ int ObResourcePlanManager::switch_resource_plan(const uint64_t tenant_id, ObStri
}
}
if (OB_SUCC(ret)) {
ObRefHolder<ObTenantIOManager> tenant_holder;
if (OB_FAIL(OB_IO_MANAGER.get_tenant_io_manager(tenant_id, tenant_holder))) {
LOG_WARN("get tenant io manager failed", K(ret), K(tenant_id));
} else {
int tmp_ret = OB_SUCCESS;
for (int64_t i = 0; i < tenant_holder.get_ptr()->get_group_num(); i++) {
uint64_t group_id = tenant_holder.get_ptr()->get_io_config().group_ids_.at(i);
if (GCTX.cgroup_ctrl_->is_valid() &&
OB_TMP_FAIL(GCTX.cgroup_ctrl_->remove_both_cgroup(
tenant_id, group_id, GCONF.enable_global_background_resource_isolation ? BACKGROUND_CGROUP : ""))) {
LOG_WARN("remove tenant cgroup failed", K(tmp_ret), K(tenant_id));
}
}
}
}
if (OB_SUCC(ret)) {
if (OB_FAIL(tenant_plan_map_.set_refactored(tenant_id, cur_plan, 1))) { // overrite
LOG_WARN("set plan failed", K(ret), K(tenant_id));
@ -199,8 +182,6 @@ int ObResourcePlanManager::refresh_resource_plan(const uint64_t tenant_id, ObStr
// - 如果 utilization = 100，那么 cfs_cpu_quota = -1
} else if (OB_FAIL(refresh_global_background_cpu())) {
LOG_WARN("fail refresh background cpu quota", K(ret));
} else if (OB_FAIL(normalize_cpu_directives(directives))) {
LOG_WARN("fail normalize directive", K(ret));
} else if (OB_FAIL(flush_directive_to_cgroup_fs(directives))) { // for CPU
LOG_WARN("fail flush directive to cgroup fs", K(ret));
}
@ -232,39 +213,6 @@ int ObResourcePlanManager::get_cur_plan(const uint64_t tenant_id, ObResMgrVarcha
return ret;
}
int ObResourcePlanManager::normalize_cpu_directives(ObPlanDirectiveSet &directives)
{
int ret = OB_SUCCESS;
double total_mgmt = 0;
for (int64_t i = 0; i < directives.count(); ++i) {
const ObPlanDirective &d = directives.at(i);
total_mgmt += d.mgmt_p1_;
}
for (int64_t i = 0; i < directives.count(); ++i) {
ObPlanDirective &d = directives.at(i);
if (0 == total_mgmt) {
d.mgmt_p1_ = 0;
} else {
d.mgmt_p1_ = d.mgmt_p1_ / total_mgmt;
}
double tenant_quota_cpu = 0;
int32_t cfs_period_us = 0;
if (d.utilization_limit_ == 100) {
// 不限制
d.utilization_limit_ = -1;
} else if (OB_FAIL(GCTX.cgroup_ctrl_->get_cpu_cfs_quota(d.tenant_id_,
tenant_quota_cpu,
OB_INVALID_GROUP_ID,
GCONF.enable_global_background_resource_isolation ? BACKGROUND_CGROUP : ""))) {
LOG_WARN("fail get cpu shares", K(d), K(ret));
} else {
d.utilization_limit_ = tenant_quota_cpu * d.utilization_limit_ / 100;
}
}
return ret;
}
int ObResourcePlanManager::normalize_iops_directives(const uint64_t tenant_id,
ObPlanDirectiveSet &directives,
ObPlanDirective &other_group_directive)
@ -358,15 +306,30 @@ int ObResourcePlanManager::flush_directive_to_cgroup_fs(ObPlanDirectiveSet &dire
} else if (!tenant_holder.get_ptr()->get_io_config().group_configs_.at(i).deleted_ &&
!tenant_holder.get_ptr()->get_io_config().group_configs_.at(i).cleared_) {
if (OB_FAIL(GCTX.cgroup_ctrl_->set_both_cpu_shares(d.tenant_id_,
d.mgmt_p1_,
d.mgmt_p1_ / 100,
d.group_id_,
GCONF.enable_global_background_resource_isolation ? BACKGROUND_CGROUP : ""))) {
LOG_ERROR("fail set cpu shares. tenant isolation function may not functional!!", K(d), K(ret));
} else if (OB_FAIL(GCTX.cgroup_ctrl_->set_both_cpu_cfs_quota(d.tenant_id_,
d.utilization_limit_,
d.group_id_,
GCONF.enable_global_background_resource_isolation ? BACKGROUND_CGROUP : ""))) {
LOG_ERROR("fail set cpu quota. tenant isolation function may not functional!!", K(d), K(ret));
} else {
double tenant_cpu_quota = 0;
if (OB_FAIL(GCTX.cgroup_ctrl_->get_cpu_cfs_quota(d.tenant_id_, tenant_cpu_quota, OB_INVALID_GROUP_ID))) {
LOG_WARN("fail get cpu quota", K(d), K(ret));
} else if (OB_FAIL(GCTX.cgroup_ctrl_->set_cpu_cfs_quota(d.tenant_id_,
-1 == tenant_cpu_quota ? -1 : tenant_cpu_quota * d.utilization_limit_ / 100,
d.group_id_))) {
LOG_ERROR("fail set cpu quota. tenant isolation function may not functional!!", K(ret), K(d), K(tenant_cpu_quota));
}
if (OB_SUCC(ret) && GCONF.enable_global_background_resource_isolation) {
if (OB_FAIL(GCTX.cgroup_ctrl_->get_cpu_cfs_quota(
d.tenant_id_, tenant_cpu_quota, OB_INVALID_GROUP_ID, BACKGROUND_CGROUP))) {
LOG_WARN("fail get cpu quota", K(d), K(ret));
} else if (OB_FAIL(GCTX.cgroup_ctrl_->set_cpu_cfs_quota(d.tenant_id_,
-1 == tenant_cpu_quota ? -1 : tenant_cpu_quota * d.utilization_limit_ / 100,
d.group_id_,
BACKGROUND_CGROUP))) {
LOG_ERROR("fail set cpu quota. tenant isolation function may not functional!!", K(ret), K(d), K(tenant_cpu_quota));
}
}
}
}
// ignore ret, continue

1
src/share/resource_manager/ob_resource_plan_manager.h
View File

@ -47,7 +47,6 @@ private:
int flush_directive_to_iops_control(const uint64_t tenant_id,
ObPlanDirectiveSet &directives,
ObPlanDirective &other_group_directive);
int normalize_cpu_directives(ObPlanDirectiveSet &directives);
int normalize_iops_directives(const uint64_t tenant_id,
ObPlanDirectiveSet &directives,
ObPlanDirective &other_group_directive);