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

Fix memory_limit check for arb server.

Browse Source
This commit is contained in:
obdev
2023-04-11 13:15:04 +08:00
committed by ob-robot
parent e43153a47b
commit e9a60698ff
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/observer/ob_server.cpp
View File

@ -1497,7 +1497,7 @@ int ObServer::init_config()
LOG_ERROR("some config setting is not valid", KR(ret)); LOG_ERROR("some config setting is not valid", KR(ret));
} else if (OB_FAIL(GMEMCONF.reload_config(config_))) { } else if (OB_FAIL(GMEMCONF.reload_config(config_))) {
LOG_ERROR("reload memory config failed", KR(ret)); LOG_ERROR("reload memory config failed", KR(ret));
} else if (OB_FAIL(set_running_mode())) { } else if (!is_arbitration_mode() && OB_FAIL(set_running_mode())) {
LOG_ERROR("set running mode failed", KR(ret)); LOG_ERROR("set running mode failed", KR(ret));
} else { } else {
int32_t local_port = static_cast<int32_t>(config_.rpc_port); int32_t local_port = static_cast<int32_t>(config_.rpc_port);
@ -1624,7 +1624,8 @@ int ObServer::init_pre_setting()
const int64_t reserved_memory = std::min(config_.cache_wash_threshold.get_value(), const int64_t reserved_memory = std::min(config_.cache_wash_threshold.get_value(),
static_cast<int64_t>(static_cast<double>(limit_memory) * KVCACHE_FACTOR)); static_cast<int64_t>(static_cast<double>(limit_memory) * KVCACHE_FACTOR));
const int64_t reserved_urgent_memory = config_.memory_reserved; const int64_t reserved_urgent_memory = config_.memory_reserved;
if (LEAST_MEMORY_SIZE >= limit_memory) { if (!is_arbitration_mode()
&& LEAST_MEMORY_SIZE >= limit_memory) {
ret = OB_INVALID_CONFIG; ret = OB_INVALID_CONFIG;
LOG_ERROR("memory limit for oceanbase isn't sufficient", LOG_ERROR("memory limit for oceanbase isn't sufficient",
"need", LEAST_MEMORY_SIZE, "need", LEAST_MEMORY_SIZE,