From ac34abdc9e383a9a0dc9604c4882f35581b1e88b Mon Sep 17 00:00:00 2001 From: hf0 Date: Thu, 22 Jul 2021 10:25:58 +0800 Subject: [PATCH] fix check_partition_exist failure code process logic. --- src/clog/ob_log_reconfirm.cpp | 2 +- src/clog/ob_log_state_mgr.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/clog/ob_log_reconfirm.cpp b/src/clog/ob_log_reconfirm.cpp index 6520ea2268..9e5c70d781 100644 --- a/src/clog/ob_log_reconfirm.cpp +++ b/src/clog/ob_log_reconfirm.cpp @@ -1134,7 +1134,7 @@ int ObLogReconfirm::reconfirm() max_flushed_id_ + 1); state_ = START_WORKING; if (OB_INVALID_TIMESTAMP != last_ts_ && OB_FAIL(sw_->try_update_submit_timestamp(last_ts_))) { - CLOG_LOG(ERROR, "sw update timestamp error", K(ret), K(last_ts_)); + CLOG_LOG(ERROR, "sw update timestamp error", K(ret), K_(partition_key), K(last_ts_)); } else { ret = mm_->write_start_membership(OB_LOG_START_MEMBERSHIP); } diff --git a/src/clog/ob_log_state_mgr.cpp b/src/clog/ob_log_state_mgr.cpp index 22fd581058..7a436142b9 100644 --- a/src/clog/ob_log_state_mgr.cpp +++ b/src/clog/ob_log_state_mgr.cpp @@ -2038,7 +2038,8 @@ bool ObLogStateMgr::is_reconfirm_role_change_or_sync_timeout_() if (OB_SUCCESS != (tmp_ret = partition_service_->check_partition_exist(partition_key_, is_exist))) { CLOG_LOG(WARN, "check_partition_exist failed", K_(partition_key), K(tmp_ret)); } - if (is_exist) { + if (is_exist || (OB_SUCCESS != tmp_ret)) { + // partition exists or check_partition_exist failed CLOG_LOG(ERROR, "is_reconfirm_role_change_or_sync_timeout_", K_(partition_key), -- GitLab