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

[bugfix] fix error log when accessing __all_virtual_ha_diagnose

Browse Source
This commit is contained in:
yyy-hust
2023-06-05 02:51:34 +00:00
committed by ob-robot
parent d627936f7d
commit 305786a690
7 changed files with 36 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/logservice/ob_log_handler.h
View File

@ -106,6 +106,7 @@ public:
int64_t &paxos_replica_num,
common::GlobalLearnerList &learner_list) const = 0;
virtual int get_global_learner_list(common::GlobalLearnerList &learner_list) const = 0;
// get leader from election, used only for non_palf_leader rebuilding.
virtual int get_election_leader(common::ObAddr &addr) const = 0;
virtual int change_replica_num(const common::ObMemberList &member_list,
const int64_t curr_replica_num,
@ -322,7 +323,7 @@ public:
// @brief, get global learner list of this paxos group
// @param[out] common::GlobalLearnerList&
int get_global_learner_list(common::GlobalLearnerList &learner_list) const override final;
// @brief, get leader from election, used for non_palf_leader rebuilding
// @brief, get leader from election, used only for non_palf_leader rebuilding
// @param[out] addr: address of leader
// retval:
// OB_SUCCESS

7
src/observer/virtual_table/ob_all_virtual_ha_diagnose.cpp
View File

@ -29,7 +29,12 @@ int ObAllVirtualHADiagnose::inner_get_next_row(common::ObNewRow *&row)
int ret = OB_SUCCESS;
storage::DiagnoseInfo diagnose_info;
if (OB_FAIL(ls.diagnose(diagnose_info))) {
SERVER_LOG(WARN, "ls stat diagnose info failed", K(ret), K(ls));
if (OB_ENTRY_NOT_EXIST == ret) {
SERVER_LOG(WARN, "ls may have been removed, just skip", K(ls));
ret = OB_SUCCESS;
} else {
SERVER_LOG(WARN, "ls stat diagnose info failed", K(ret), K(ls));
}
} else if (OB_FAIL(insert_stat_(diagnose_info))) {
SERVER_LOG(WARN, "insert stat failed", K(ret), K(diagnose_info));
} else if (OB_FAIL(scanner_.add_row(cur_row_))) {