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

[CP] fix rulescan bugs

Browse Source
This commit is contained in:
zhjc1124
2023-12-14 12:43:15 +00:00
committed by ob-robot
parent 72eb324ca2
commit 8f4b4ba619
12 changed files with 47 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/observer/ob_server_reload_config.cpp
View File

@ -88,54 +88,44 @@ ObServerReloadConfig::~ObServerReloadConfig()
int ObServerReloadConfig::operator()()
{
int ret = OB_SUCCESS;
int real_ret = ret;
int tmp_ret = OB_SUCCESS;
int ret = tmp_ret;
const bool is_arbitration_mode = OBSERVER.is_arbitration_mode();
if (!gctx_.is_inited()) {
real_ret = ret = OB_INNER_STAT_ERROR;
LOG_WARN("gctx not init", "gctx inited", gctx_.is_inited(), K(ret));
ret = tmp_ret = OB_INNER_STAT_ERROR;
LOG_WARN("gctx not init", "gctx inited", gctx_.is_inited(), K(tmp_ret));
} else {
if (OB_FAIL(ObReloadConfig::operator()())) {
real_ret = ret;
LOG_WARN("ObReloadConfig operator() failed", K(ret));
if (OB_TMP_FAIL(ObReloadConfig::operator()())) {
LOG_WARN("ObReloadConfig operator() failed", K(tmp_ret));
}
if (OB_FAIL(gctx_.root_service_->reload_config())) {
real_ret = ret;
LOG_WARN("root_service_ reload_config failed", K(ret));
if (OB_TMP_FAIL(gctx_.root_service_->reload_config())) {
LOG_WARN("root_service_ reload_config failed", K(tmp_ret));
}
if (OB_FAIL(gctx_.location_service_->reload_config())) {
real_ret = ret;
LOG_WARN("location service reload config failed", KR(ret));
if (OB_TMP_FAIL(gctx_.location_service_->reload_config())) {
LOG_WARN("location service reload config failed", KR(tmp_ret));
}
if (OB_FAIL(ObClusterVersion::get_instance().reload_config())) {
real_ret = ret;
LOG_WARN("cluster version reload config failed", K(ret));
if (OB_TMP_FAIL(ObClusterVersion::get_instance().reload_config())) {
LOG_WARN("cluster version reload config failed", K(tmp_ret));
}
if (OB_FAIL(OBSERVER.reload_config())) {
real_ret = ret;
LOG_WARN("reload configuration for ob service fail", K(ret));
if (OB_TMP_FAIL(OBSERVER.reload_config())) {
LOG_WARN("reload configuration for ob service fail", K(tmp_ret));
}
if (OB_FAIL(OBSERVER.get_net_frame().reload_config())) {
real_ret = ret;
LOG_WARN("reload configuration for net frame fail", K(ret));
if (OB_TMP_FAIL(OBSERVER.get_net_frame().reload_config())) {
LOG_WARN("reload configuration for net frame fail", K(tmp_ret));
}
if (OB_FAIL(OBSERVER.get_net_frame().reload_ssl_config())) {
real_ret = ret;
LOG_WARN("reload ssl config for net frame fail", K(ret));
if (OB_TMP_FAIL(OBSERVER.get_net_frame().reload_ssl_config())) {
LOG_WARN("reload ssl config for net frame fail", K(tmp_ret));
}
if (OB_FAIL(OBSERVER.get_rl_mgr().reload_config())) {
real_ret = ret;
LOG_WARN("reload config for ratelimit manager fail", K(ret));
if (OB_TMP_FAIL(OBSERVER.get_rl_mgr().reload_config())) {
LOG_WARN("reload config for ratelimit manager fail", K(tmp_ret));
}
if (OB_FAIL(ObTdeEncryptEngineLoader::get_instance().reload_config())) {
real_ret = ret;
LOG_WARN("reload config for tde encrypt engine fail", K(ret));
if (OB_TMP_FAIL(ObTdeEncryptEngineLoader::get_instance().reload_config())) {
LOG_WARN("reload config for tde encrypt engine fail", K(tmp_ret));
}
if (OB_FAIL(ObSrvNetworkFrame::reload_rpc_auth_method())) {
real_ret = ret;
LOG_WARN("reload config for rpc auth method fail", K(ret));
if (OB_TMP_FAIL(ObSrvNetworkFrame::reload_rpc_auth_method())) {
LOG_WARN("reload config for rpc auth method fail", K(tmp_ret));
}
}
{
@ -143,9 +133,8 @@ int ObServerReloadConfig::operator()()
const int64_t limit_memory = GMEMCONF.get_server_memory_limit();
OB_LOGGER.set_info_as_wdiag(GET_MIN_CLUSTER_VERSION() < CLUSTER_VERSION_4_1_0_0);
// reload log config again after get MIN_CLUSTER_VERSION
if (OB_FAIL(ObReloadConfig::operator()())) {
real_ret = ret;
LOG_WARN("ObReloadConfig operator() failed", K(ret));
if (OB_TMP_FAIL(ObReloadConfig::operator()())) {
LOG_WARN("ObReloadConfig operator() failed", K(tmp_ret));
}
const int64_t reserved_memory = GCONF.cache_wash_threshold;
const int64_t reserved_urgent_memory = GCONF.memory_reserved;
@ -173,9 +162,8 @@ int ObServerReloadConfig::operator()()
io_config.data_storage_warning_tolerance_time_ = GCONF.data_storage_warning_tolerance_time;
io_config.data_storage_error_tolerance_time_ = GCONF.data_storage_error_tolerance_time;
if (!is_arbitration_mode
&& OB_FAIL(ObIOManager::get_instance().set_io_config(io_config))) {
real_ret = ret;
LOG_WARN("reload io manager config fail, ", K(ret));
&& OB_TMP_FAIL(ObIOManager::get_instance().set_io_config(io_config))) {
LOG_WARN("reload io manager config fail, ", K(tmp_ret));
}
(void)reload_diagnose_info_config(GCONF.enable_perf_event);
@ -329,7 +317,7 @@ int ObServerReloadConfig::operator()()
{
ObMallocAllocator::get_instance()->force_malloc_for_absent_tenant_ = GCONF._force_malloc_for_absent_tenant;
}
return real_ret;
return ret;
}
void ObServerReloadConfig::reload_tenant_scheduler_config_()