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

内存可读位点统计忽略rpc失败

Browse Source
This commit is contained in:
maosy
2024-02-09 13:32:41 +00:00
committed by ob-robot
parent ff093f58f1
commit 4c88bd2118
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/rootserver/ob_ls_recovery_stat_handler.cpp
View File

@ -493,8 +493,13 @@ int ObLSRecoveryStatHandler::gather_replica_readable_scn()
LOG_TRACE("ls readable scn in memory", KR(ret), K(ls_id), K(replicas_scn_)); LOG_TRACE("ls readable scn in memory", KR(ret), K(ls_id), K(replicas_scn_));
} }
} }
if (FAILEDx(try_reload_and_fix_config_version_(palf_stat_second.config_version_))) { if (is_strong_leader(palf_stat_second.role_)) {
LOG_WARN("failed to try reload and fix config version", KR(ret), K(palf_stat_second)); //优先把正确的config_version更新到内部表和内存中
int tmp_ret = OB_SUCCESS;
if (OB_TMP_FAIL(try_reload_and_fix_config_version_(palf_stat_second.config_version_))) {
ret = OB_SUCC(ret) ? tmp_ret : ret;
LOG_WARN("failed to try reload and fix config version", KR(tmp_ret), KR(ret), K(palf_stat_second));
}
} }
return ret; return ret;
} }
@ -547,10 +552,10 @@ int ObLSRecoveryStatHandler::do_get_each_replica_readable_scn_(
K(proxy.get_results())); K(proxy.get_results()));
} }
for (int64_t i = 0; OB_SUCC(ret) && i < return_code_array.count(); ++i) { for (int64_t i = 0; OB_SUCC(ret) && i < return_code_array.count(); ++i) {
if (OB_FAIL(return_code_array.at(i))) { if (OB_TMP_FAIL(return_code_array.at(i))) {
LOG_WARN("send rpc is failed", KR(ret), K(i), K(return_code_array)); LOG_WARN("send rpc is failed", KR(tmp_ret), K(i), K(return_code_array));
} else { } else {
const auto *result = proxy.get_results().at(i); const ObGetLSReplayedScnRes *result = proxy.get_results().at(i);
if (OB_ISNULL(result)) { if (OB_ISNULL(result)) {
ret = OB_ERR_UNEXPECTED; ret = OB_ERR_UNEXPECTED;
LOG_WARN("result is null", KR(ret), K(i), K(return_code_array)); LOG_WARN("result is null", KR(ret), K(i), K(return_code_array));