diff --git a/deps/oblib/src/lib/ob_define.h b/deps/oblib/src/lib/ob_define.h index adae82dcbf..5d6f1c1c67 100644 --- a/deps/oblib/src/lib/ob_define.h +++ b/deps/oblib/src/lib/ob_define.h @@ -844,8 +844,8 @@ const double MONITOR_MEM_FACTOR = 0.01; const double KVCACHE_FACTOR = TENANT_RESERVE_MEM_RATIO; const double MIN_TENANT_QUOTA = .5; -const double OB_DTL_CPU = (sysconf(_SC_NPROCESSORS_ONLN) <= 4) ? 1. : 5.; -const double OB_DATA_CPU = (sysconf(_SC_NPROCESSORS_ONLN) <= 4) ? 1. : 2.5; +const double OB_DTL_CPU = 5.; +const double OB_DATA_CPU = 2.5; const uint64_t OB_INVALID_TENANT_ID = 0; const uint64_t OB_SYS_TENANT_ID = 1; diff --git a/src/observer/omt/ob_multi_tenant.cpp b/src/observer/omt/ob_multi_tenant.cpp index 5ce9a37cf9..f1b4a4ec67 100644 --- a/src/observer/omt/ob_multi_tenant.cpp +++ b/src/observer/omt/ob_multi_tenant.cpp @@ -687,17 +687,20 @@ int ObMultiTenant::create_hidden_sys_tenant() int ObMultiTenant::create_virtual_tenants() { int ret = OB_SUCCESS; + const int64_t phy_cpu_cnt = sysconf(_SC_NPROCESSORS_ONLN); + const double data_cpu = (phy_cpu_cnt <= 4) ? 1.0 : OB_DATA_CPU; + const double dtl_cpu = (phy_cpu_cnt <= 4) ? 1.0 : OB_DTL_CPU; if (OB_FAIL(create_tenant_without_unit( OB_DATA_TENANT_ID, - OB_DATA_CPU, - OB_DATA_CPU))) { + data_cpu, + data_cpu))) { LOG_ERROR("add data tenant fail", K(ret)); } else if (OB_FAIL(create_tenant_without_unit( OB_DTL_TENANT_ID, - OB_DTL_CPU, - OB_DTL_CPU))) { + dtl_cpu, + dtl_cpu))) { LOG_ERROR("add DTL tenant fail", K(ret)); } else { diff --git a/src/observer/omt/ob_multi_tenant.h b/src/observer/omt/ob_multi_tenant.h index 6120e14c44..7bac65ae93 100644 --- a/src/observer/omt/ob_multi_tenant.h +++ b/src/observer/omt/ob_multi_tenant.h @@ -37,10 +37,6 @@ class ObRequest; namespace omt { class ObTenantConfig; -#define VIRTUAL_TENANTS_CPU_RESERVED_QUOTA \ - (GCONF.user_location_cpu_quota() + GCONF.sys_location_cpu_quota() \ - + GCONF.root_location_cpu_quota() + GCONF.core_location_cpu_quota() \ - + OB_SVR_BLACKLIST_CPU + OB_DATA_CPU + OB_DTL_CPU + OB_DIAG_CPU) struct ObCtxMemConfig {