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

rename resubmit_2pc_log and remove info log

Browse Source
This commit is contained in:
obdev
2023-01-05 14:41:44 +00:00
committed by ob-robot
parent 58ae97b3c4
commit ca82e08423
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/storage/tx/ob_two_phase_committer.h
View File

@ -362,7 +362,7 @@ private:
// Because the submit_log may fail, we need retry to submit the log under // Because the submit_log may fail, we need retry to submit the log under
// exception. // exception.
int decide_2pc_log_type_(bool &need_submit, ObTwoPhaseCommitLogType &log_type); 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 // Means we collect all downstream responses
bool all_downstream_collected_(); bool all_downstream_collected_();

4
src/storage/tx/ob_two_phase_downstream_committer.cpp
View File

@ -1147,7 +1147,7 @@ int ObTxCycleTwoPhaseCommitter::on_pre_commit()
return ret; return ret;
} }
int ObTxCycleTwoPhaseCommitter::resubmit_2pc_log_() int ObTxCycleTwoPhaseCommitter::submit_2pc_log_()
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
int tmp_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))) { } else if (need_submit && OB_TMP_FAIL(submit_log(log_type))) {
TRANS_LOG(WARN, "submit log failed", KR(tmp_ret), K(log_type)); TRANS_LOG(WARN, "submit log failed", KR(tmp_ret), K(log_type));
} else if (need_submit) { } 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; return ret;

4
src/storage/tx/ob_two_phase_upstream_committer.cpp
View File

@ -141,7 +141,7 @@ int ObTxCycleTwoPhaseCommitter::drive_self_2pc_phase(ObTxState next_phase)
if (OB_FAIL(ret)) { if (OB_FAIL(ret)) {
// do nothing // do nothing
} else if (!no_need_submit_log && !is_2pc_logging()) { } 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)); TRANS_LOG(WARN, "submit log failed", K(ret));
} }
} }
@ -227,7 +227,7 @@ int ObTxCycleTwoPhaseCommitter::handle_timeout()
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
int tmp_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)); TRANS_LOG(WARN, "resubmit 2pc log failed", KR(tmp_ret));
} }