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

Fix coredump for vmovsd instruction

Browse Source
This commit is contained in:
obdev
2023-08-17 11:53:41 +00:00
committed by ob-robot
parent 1d4d8c4861
commit a29d442812
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
deps/oblib/src/lib/ob_define.h vendored
View File

@ -844,8 +844,8 @@ const double MONITOR_MEM_FACTOR = 0.01;
const double KVCACHE_FACTOR = TENANT_RESERVE_MEM_RATIO; const double KVCACHE_FACTOR = TENANT_RESERVE_MEM_RATIO;
const double MIN_TENANT_QUOTA = .5; const double MIN_TENANT_QUOTA = .5;
const double OB_DTL_CPU = (sysconf(_SC_NPROCESSORS_ONLN) <= 4) ? 1. : 5.; const double OB_DTL_CPU = 5.;
const double OB_DATA_CPU = (sysconf(_SC_NPROCESSORS_ONLN) <= 4) ? 1. : 2.5; const double OB_DATA_CPU = 2.5;
const uint64_t OB_INVALID_TENANT_ID = 0; const uint64_t OB_INVALID_TENANT_ID = 0;
const uint64_t OB_SYS_TENANT_ID = 1; const uint64_t OB_SYS_TENANT_ID = 1;

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

@ -687,17 +687,20 @@ int ObMultiTenant::create_hidden_sys_tenant()
int ObMultiTenant::create_virtual_tenants() int ObMultiTenant::create_virtual_tenants()
{ {
int ret = OB_SUCCESS; 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( if (OB_FAIL(create_tenant_without_unit(
OB_DATA_TENANT_ID, OB_DATA_TENANT_ID,
OB_DATA_CPU, data_cpu,
OB_DATA_CPU))) { data_cpu))) {
LOG_ERROR("add data tenant fail", K(ret)); LOG_ERROR("add data tenant fail", K(ret));
} else if (OB_FAIL(create_tenant_without_unit( } else if (OB_FAIL(create_tenant_without_unit(
OB_DTL_TENANT_ID, OB_DTL_TENANT_ID,
OB_DTL_CPU, dtl_cpu,
OB_DTL_CPU))) { dtl_cpu))) {
LOG_ERROR("add DTL tenant fail", K(ret)); LOG_ERROR("add DTL tenant fail", K(ret));
} else { } else {

4
src/observer/omt/ob_multi_tenant.h
View File

@ -37,10 +37,6 @@ class ObRequest;
namespace omt namespace omt
{ {
class ObTenantConfig; 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 struct ObCtxMemConfig
{ {