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

fix .wf missing error_log

Browse Source
This commit is contained in:
tushicheng 2023-05-17 16:16:48 +00:00 committed by ob-robot
parent b1bb0aefec
commit 25f70ff29f
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deps/oblib/src/lib/alloc/ob_malloc_allocator.cpp vendored
View File

@ -482,7 +482,7 @@ void ObMallocAllocator::print_tenant_memory_usage(uint64_t tenant_id) const
char *buf = (char *)ctxalp(BUFLEN);
if (OB_ISNULL(buf)) {
ret = OB_ALLOCATE_MEMORY_FAILED;
LIB_LOG(ERROR, "no memory", K(ret));
LIB_LOG(WARN, "no memory", K(ret));
} else {
int64_t ctx_pos = 0;
const volatile int64_t *ctx_hold_bytes = mgr->get_ctx_hold_bytes();

11
src/share/config/ob_server_config.cpp
View File

@ -276,6 +276,17 @@ int ObServerMemoryConfig::reload_config(const ObServerConfig& server_config)
LOG_ERROR("update memory_limit or system_memory failed",
K(memory_limit), K(system_memory));
}
int64_t observer_tenant_hold = lib::get_tenant_memory_hold(OB_SERVER_TENANT_ID);
if (observer_tenant_hold > system_memory_) {
if (server_config._ignore_system_memory_over_limit_error) {
LOG_WARN("the hold of observer tenant is over the system_memory",
K(observer_tenant_hold), K_(system_memory));
} else {
LOG_ERROR("the hold of observer tenant is over the system_memory",
K(observer_tenant_hold), K_(system_memory));
}
}
return ret;
}

11
src/share/ob_tenant_mgr.cpp
View File

@ -405,17 +405,6 @@ int ObVirtualTenantManager::print_tenant_usage_(
mallocator->print_tenant_memory_usage(node.tenant_id_);
mallocator->print_tenant_ctx_memory_usage(node.tenant_id_);
}
if (OB_SERVER_TENANT_ID == node.tenant_id_) {
int64_t observer_tenant_hold = lib::get_tenant_memory_hold(node.tenant_id_);
int64_t system_memory = GMEMCONF.get_reserved_server_memory();
if (observer_tenant_hold > system_memory) {
if (GCONF._ignore_system_memory_over_limit_error) {
COMMON_LOG(WARN, "the hold of observer tenant is over the system_memory", K(observer_tenant_hold), K(system_memory));
} else {
COMMON_LOG(ERROR, "the hold of observer tenant is over the system_memory", K(observer_tenant_hold), K(system_memory));
}
}
}
return ret;
}