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

Sql audit desige changed about mem_limit, queue_size and etc.

Browse Source
This commit is contained in:
obdev
2023-03-16 11:13:45 +00:00
committed by ob-robot
parent 9cbcd25e12
commit 4bac5ef560
3 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/observer/mysql/ob_eliminate_task.cpp
View File

@ -53,33 +53,29 @@ int ObEliminateTask::check_config_mem_limit(bool &is_change)
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
is_change = false; is_change = false;
int64_t mem_limit = config_mem_limit_; int64_t mem_limit = config_mem_limit_;
int64_t tenant_id = OB_INVALID_TENANT_ID;
if (OB_ISNULL(request_manager_)) { if (OB_ISNULL(request_manager_)) {
ret = OB_INVALID_ARGUMENT; ret = OB_INVALID_ARGUMENT;
LOG_WARN("invalid argument", K(request_manager_), K(ret)); LOG_WARN("invalid argument", K(request_manager_), K(ret));
} else if (request_manager_->get_tenant_id() > OB_SYS_TENANT_ID && } else if (FALSE_IT(tenant_id = request_manager_->get_tenant_id())) {
request_manager_->get_tenant_id() <= OB_MAX_RESERVED_TENANT_ID) { } else if (tenant_id > OB_SYS_TENANT_ID && tenant_id <= OB_MAX_RESERVED_TENANT_ID) {
// 50x租户在没有对应的tenant schema，查询配置一定失败 // 50x租户在没有对应的tenant schema，查询配置一定失败
// do nothing // do nothing
} else if (OB_FAIL(ObMySQLRequestManager::get_mem_limit(request_manager_->get_tenant_id(), } else if (OB_FAIL(ObMySQLRequestManager::get_mem_limit(tenant_id, mem_limit))) {
mem_limit))) {
LOG_WARN("failed to get mem limit", K(ret));
// if memory limit is not retrivable // if memory limit is not retrivable
// overwrite error code, set mem config to default value // overwrite error code, not change the size of config_mem_limit_
// so that total memory use of sql audit can be limited LOG_WARN("failed to get mem limit", K(ret), K(tenant_id), K(mem_limit), K(config_mem_limit_));
ret = OB_SUCCESS; ret = OB_SUCCESS;
mem_limit = MAXIMUM_LIMIT;
} else { } else {
// do nothing if (config_mem_limit_ != mem_limit) {
} LOG_INFO("change config mem limit", K(config_mem_limit_), K(mem_limit), K(tenant_id));
if (config_mem_limit_ != mem_limit) { bool use_mini_mem = lib::is_mini_mode() || MTL_IS_MINI_MODE() || is_meta_tenant(tenant_id);
LOG_INFO("before change config mem", K(config_mem_limit_)); config_mem_limit_ = mem_limit;
config_mem_limit_ = mem_limit; if (mem_limit < MINIMUM_LIMIT && !use_mini_mem) {
if (mem_limit < MINIMUM_LIMIT && !lib::is_mini_mode()) { config_mem_limit_ = MINIMUM_LIMIT;
config_mem_limit_ = MINIMUM_LIMIT; }
is_change = true;
} }
is_change = true;
LOG_INFO("after change config mem", K(config_mem_limit_));
} }
return ret; return ret;
} }
@ -151,7 +147,14 @@ void ObEliminateTask::runTimerTask()
ret = OB_NOT_INIT; ret = OB_NOT_INIT;
LOG_WARN("fail to get sql audit evict memory level", K(ret)); LOG_WARN("fail to get sql audit evict memory level", K(ret));
} }
if (OB_SUCC(ret) && REACH_TIME_INTERVAL(30 * 1000 * 1000)) { // 30s delay
LOG_INFO("Eliminate task evict sql audit",
K(request_manager_->get_tenant_id()), K(queue_size),
K(request_manager_->get_size_used()), K(evict_high_size_level), K(evict_low_size_level),
K(allocator->allocated()), K(evict_high_mem_level), K(evict_low_mem_level));
}
} }
if (OB_SUCC(ret)) { if (OB_SUCC(ret)) {
int64_t start_time = ObTimeUtility::current_time(); int64_t start_time = ObTimeUtility::current_time();
int64_t evict_batch_count = 0; int64_t evict_batch_count = 0;

5
src/observer/mysql/ob_mysql_request_manager.cpp
View File

@ -301,12 +301,15 @@ int ObMySQLRequestManager::mtl_init(ObMySQLRequestManager* &req_mgr)
} else { } else {
uint64_t tenant_id = lib::current_resource_owner_id(); uint64_t tenant_id = lib::current_resource_owner_id();
int64_t mem_limit = lib::get_tenant_memory_limit(tenant_id); int64_t mem_limit = lib::get_tenant_memory_limit(tenant_id);
int64_t queue_size = (lib::is_mini_mode() || MTL_IS_MINI_MODE())? MINI_MODE_MAX_QUEUE_SIZE : MAX_QUEUE_SIZE; mem_limit = static_cast<int64_t>(static_cast<double>(mem_limit) * SQL_AUDIT_MEM_FACTOR);
bool use_mini_queue = lib::is_mini_mode() || MTL_IS_MINI_MODE() || is_meta_tenant(tenant_id);
int64_t queue_size = use_mini_queue ? MINI_MODE_MAX_QUEUE_SIZE : MAX_QUEUE_SIZE;
if (OB_FAIL(req_mgr->init(tenant_id, mem_limit, queue_size))) { if (OB_FAIL(req_mgr->init(tenant_id, mem_limit, queue_size))) {
LOG_WARN("failed to init request manager", K(ret)); LOG_WARN("failed to init request manager", K(ret));
} else { } else {
// do nothing // do nothing
} }
LOG_INFO("mtl init finish", K(tenant_id), K(mem_limit), K(queue_size), K(ret));
} }
if (OB_FAIL(ret) && req_mgr != nullptr) { if (OB_FAIL(ret) && req_mgr != nullptr) {
// cleanup // cleanup

2
src/sql/session/ob_sql_session_info.cpp
View File

@ -758,7 +758,7 @@ ObMySQLRequestManager* ObSQLSessionInfo::get_request_manager()
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
if (NULL == request_manager_) { if (NULL == request_manager_) {
MTL_SWITCH(get_priv_tenant_id()) { MTL_SWITCH(get_effective_tenant_id()) {
request_manager_ = MTL(obmysql::ObMySQLRequestManager*); request_manager_ = MTL(obmysql::ObMySQLRequestManager*);
} }
} }