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

remain cpu_cfs_quota=-1 when dec cpu_quota

Browse Source
This commit is contained in:
zhjc1124 2024-06-20 11:20:45 +00:00 committed by ob-robot
parent 8755322616
commit f67f7ccbd3
3 changed files with 53 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
src/share/resource_manager/ob_cgroup_ctrl.cpp
View File

@ -185,8 +185,9 @@ int ObCgroupCtrl::remove_dir_(const char *curr_dir)
class RemoveProccessor : public ObCgroupCtrl::DirProcessor
{
public:
int handle_dir(const char *curr_path)
int handle_dir(const char *curr_path, bool is_top_dir)
{
UNUSED(is_top_dir);
return ObCgroupCtrl::remove_dir_(curr_path);
}
};
@ -204,32 +205,33 @@ int ObCgroupCtrl::recursion_process_group_(const char *curr_path, DirProcessor *
LOG_WARN("check dir type failed", K(ret), K(curr_path));
} else if (NOT_DIR == type) {
// not directory, skip
} else if (LEAF_DIR == type) {
if (OB_FAIL(processor_ptr->handle_dir(curr_path))) {
LOG_WARN("process sub group directory failed", K(ret), K(curr_path));
}
} else {
DIR *dir = nullptr;
if (NULL == (dir = opendir(curr_path))){
ret = OB_ERR_UNEXPECTED;
LOG_WARN("open dir failed", K(ret), K(curr_path));
if (LEAF_DIR == type) {
// no sub directory to handle
} else {
struct dirent *subdir = nullptr;
char sub_path[PATH_BUFSIZE];
int tmp_ret = OB_SUCCESS;
while (OB_SUCCESS == tmp_ret && (NULL != (subdir = readdir(dir)))) {
if (0 == strcmp(subdir->d_name, ".") || 0 == strcmp(subdir->d_name, "..")) {
// skip . and ..
} else if (PATH_BUFSIZE <= snprintf(sub_path, PATH_BUFSIZE, "%s/%s", curr_path, subdir->d_name)) { // to prevent infinite recursion when path string is over size and cut off
ret = OB_ERR_UNEXPECTED;
LOG_WARN("sub_path is oversize has been cut off", K(ret), K(sub_path), K(curr_path));
} else if (OB_TMP_FAIL(recursion_process_group_(sub_path, processor_ptr))) {
DIR *dir = nullptr;
if (NULL == (dir = opendir(curr_path))) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("open dir failed", K(ret), K(curr_path));
} else {
struct dirent *subdir = nullptr;
char sub_path[PATH_BUFSIZE];
int tmp_ret = OB_SUCCESS;
while (OB_SUCCESS == tmp_ret && (NULL != (subdir = readdir(dir)))) {
if (0 == strcmp(subdir->d_name, ".") || 0 == strcmp(subdir->d_name, "..")) {
// skip . and ..
} else if (PATH_BUFSIZE <= snprintf(sub_path, PATH_BUFSIZE, "%s/%s", curr_path, subdir->d_name)) {
// to prevent infinite recursion when path string is over size and cut off
ret = OB_ERR_UNEXPECTED;
LOG_WARN("sub_path is oversize has been cut off", K(ret), K(sub_path), K(curr_path));
} else if (OB_TMP_FAIL(recursion_process_group_(sub_path, processor_ptr))) {
LOG_WARN("process path failed", K(sub_path));
}
}
}
if (0 != strcmp(root_cgroup_, curr_path) && OB_FAIL(processor_ptr->handle_dir(curr_path))) {
LOG_WARN("process sub group directory failed", K(ret), K(curr_path));
}
}
if (OB_SUCC(ret) && 0 != strcmp(root_cgroup_, curr_path) && OB_FAIL(processor_ptr->handle_dir(curr_path, true))) {
LOG_WARN("process group directory failed", K(ret), K(curr_path));
}
}
return ret;
@ -493,25 +495,32 @@ int ObCgroupCtrl::set_cpu_cfs_quota(const uint64_t tenant_id, const double cpu,
double target_cpu = cpu;
double base_cpu = -1;
if (is_valid_tenant_id(tenant_id) &&
OB_FAIL(get_cpu_cfs_quota(OB_INVALID_TENANT_ID, base_cpu, OB_INVALID_GROUP_ID, base_path))) {
LOG_WARN("get background cpu cfs quota failed", K(ret), K(tenant_id));
} else {
// background quota limit
if (is_valid_tenant_id(tenant_id) && OB_NOT_NULL(base_path) && 0 != STRLEN(base_path)) {
int compare_ret = 0;
if (OB_FAIL(compare_cpu(target_cpu, base_cpu, compare_ret))){
if (OB_FAIL(get_cpu_cfs_quota(OB_INVALID_TENANT_ID, base_cpu, OB_INVALID_GROUP_ID, base_path))) {
LOG_WARN("get background cpu cfs quota failed", K(ret), K(tenant_id));
} else if (OB_FAIL(compare_cpu(target_cpu, base_cpu, compare_ret))) {
LOG_WARN("compare cpu failed", K(ret), K(target_cpu), K(base_cpu));
} else if(compare_ret > 0) {
} else if (compare_ret > 0) {
target_cpu = base_cpu;
}
double tenant_cpu = -1;
if (OB_SUCC(ret) && is_valid_id(group_id) && OB_FAIL(get_cpu_cfs_quota(tenant_id, tenant_cpu, OB_INVALID_GROUP_ID, base_path))) {
}
// tenant quota limit
double tenant_cpu = -1;
if (OB_SUCC(ret) && is_valid_group(group_id)) {
int compare_ret = 0;
if (OB_FAIL(get_cpu_cfs_quota(tenant_id, tenant_cpu, OB_INVALID_GROUP_ID, base_path))) {
LOG_WARN("get tenant cpu cfs quota failed", K(ret), K(tenant_id));
} else if (OB_FAIL(compare_cpu(target_cpu, tenant_cpu, compare_ret))) {
LOG_WARN("compare cpu failed", K(ret), K(target_cpu), K(tenant_cpu));
} else if(compare_ret > 0) {
} else if (compare_ret > 0) {
target_cpu = tenant_cpu;
}
}
if (OB_SUCC(ret)) {
double current_cpu = -1;
char group_path[PATH_BUFSIZE];
@ -524,12 +533,10 @@ int ObCgroupCtrl::set_cpu_cfs_quota(const uint64_t tenant_id, const double cpu,
LOG_WARN("compare cpu failed", K(ret), K(target_cpu), K(current_cpu));
} else if (0 == compare_ret) {
// no need to change
} else if (compare_ret < 0) {
ret = recursion_dec_cpu_cfs_quota_(group_path, target_cpu);
} else {
if (compare_ret < 0) {
ret = recursion_dec_cpu_cfs_quota_(group_path, target_cpu);
} else {
ret = set_cpu_cfs_quota_by_path_(group_path, target_cpu);
}
ret = set_cpu_cfs_quota_by_path_(group_path, target_cpu);
}
if (OB_FAIL(ret)) {
LOG_WARN("set cpu cfs quota failed",
@ -550,14 +557,15 @@ class DecQuotaProcessor : public ObCgroupCtrl::DirProcessor
public:
DecQuotaProcessor(const double cpu) : cpu_(cpu)
{}
int handle_dir(const char *curr_path)
int handle_dir(const char *curr_path, bool is_top_dir)
{
int ret = OB_SUCCESS;
double current_cpu = -1;
int compare_ret = 0;
if (OB_FAIL(ObCgroupCtrl::get_cpu_cfs_quota_by_path_(curr_path, current_cpu))) {
LOG_WARN("get cpu cfs quota failed", K(ret), K(curr_path));
} else if (OB_SUCC(ObCgroupCtrl::compare_cpu(cpu_, current_cpu, compare_ret)) && compare_ret >= 0) {
} else if ((!is_top_dir && -1 == current_cpu) ||
(OB_SUCC(ObCgroupCtrl::compare_cpu(cpu_, current_cpu, compare_ret)) && compare_ret >= 0)) {
// do nothing
} else if (OB_FAIL(ObCgroupCtrl::set_cpu_cfs_quota_by_path_(curr_path, cpu_))) {
LOG_WARN("set cpu cfs quota failed", K(curr_path), K(cpu_));
@ -653,7 +661,7 @@ int ObCgroupCtrl::set_both_cpu_cfs_quota(const uint64_t tenant_id, const double
{
int ret = OB_SUCCESS;
if (OB_FAIL(set_cpu_cfs_quota(tenant_id, cpu, group_id))) {
LOG_WARN("set background tenant cpu cfs quota failed", K(ret), K(tenant_id), K(group_id), K(cpu));
LOG_WARN("set tenant cpu cfs quota failed", K(ret), K(tenant_id), K(group_id), K(cpu));
} else if (OB_NOT_NULL(base_path) && 0 != STRLEN(base_path) && OB_FAIL(set_cpu_cfs_quota(tenant_id, cpu, group_id, base_path))) {
LOG_WARN("set background tenant cpu cfs quota failed", K(ret), K(tenant_id), K(group_id), K(cpu));
}

2
src/share/resource_manager/ob_cgroup_ctrl.h
View File

@ -195,7 +195,7 @@ public:
public:
DirProcessor() = default;
~DirProcessor() = default;
virtual int handle_dir(const char *group_path) = 0;
virtual int handle_dir(const char *group_path, bool is_top_dir=false) = 0;
};
private:

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

@ -323,6 +323,11 @@ int ObResourcePlanManager::flush_directive_to_cgroup_fs(ObPlanDirectiveSet &dire
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 (-1 == tenant_cpu_quota &&
OB_FAIL(GCTX.cgroup_ctrl_->get_cpu_cfs_quota(
OB_INVALID_TENANT_ID, tenant_cpu_quota, OB_INVALID_GROUP_ID, BACKGROUND_CGROUP))) {
// tenant cgoup quota is -1, and need get background cpu quota
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_,