diff --git a/src/storage/tx/ob_two_phase_committer.h b/src/storage/tx/ob_two_phase_committer.h index 9885bce505..489872aa3a 100644 --- a/src/storage/tx/ob_two_phase_committer.h +++ b/src/storage/tx/ob_two_phase_committer.h @@ -362,7 +362,7 @@ private: // Because the submit_log may fail, we need retry to submit the log under // exception. int decide_2pc_log_type_(bool &need_submit, ObTwoPhaseCommitLogType &log_type); - int resubmit_2pc_log_(); + int submit_2pc_log_(); // Means we collect all downstream responses bool all_downstream_collected_(); diff --git a/src/storage/tx/ob_two_phase_downstream_committer.cpp b/src/storage/tx/ob_two_phase_downstream_committer.cpp index eb26c24ced..af9f269ad8 100644 --- a/src/storage/tx/ob_two_phase_downstream_committer.cpp +++ b/src/storage/tx/ob_two_phase_downstream_committer.cpp @@ -1147,7 +1147,7 @@ int ObTxCycleTwoPhaseCommitter::on_pre_commit() return ret; } -int ObTxCycleTwoPhaseCommitter::resubmit_2pc_log_() +int ObTxCycleTwoPhaseCommitter::submit_2pc_log_() { int ret = OB_SUCCESS; int tmp_ret = OB_SUCCESS; @@ -1159,7 +1159,7 @@ int ObTxCycleTwoPhaseCommitter::resubmit_2pc_log_() } else if (need_submit && OB_TMP_FAIL(submit_log(log_type))) { TRANS_LOG(WARN, "submit log failed", KR(tmp_ret), K(log_type)); } else if (need_submit) { - TRANS_LOG(INFO, "resubmit 2pc log succeed", KR(tmp_ret), K(log_type), KPC(this)); + // TRANS_LOG(INFO, "resubmit 2pc log succeed", KR(tmp_ret), K(log_type), KPC(this)); } return ret; diff --git a/src/storage/tx/ob_two_phase_upstream_committer.cpp b/src/storage/tx/ob_two_phase_upstream_committer.cpp index 7f56f5d9ec..51b5d65804 100644 --- a/src/storage/tx/ob_two_phase_upstream_committer.cpp +++ b/src/storage/tx/ob_two_phase_upstream_committer.cpp @@ -141,7 +141,7 @@ int ObTxCycleTwoPhaseCommitter::drive_self_2pc_phase(ObTxState next_phase) if (OB_FAIL(ret)) { // do nothing } else if (!no_need_submit_log && !is_2pc_logging()) { - if (OB_TMP_FAIL(resubmit_2pc_log_())) { + if (OB_TMP_FAIL(submit_2pc_log_())) { TRANS_LOG(WARN, "submit log failed", K(ret)); } } @@ -227,7 +227,7 @@ int ObTxCycleTwoPhaseCommitter::handle_timeout() int ret = OB_SUCCESS; int tmp_ret = OB_SUCCESS; - if (OB_TMP_FAIL(resubmit_2pc_log_())) { + if (OB_TMP_FAIL(submit_2pc_log_())) { TRANS_LOG(WARN, "resubmit 2pc log failed", KR(tmp_ret)); }