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

fix errcode rewrite

Browse Source
This commit is contained in:
obdev
2023-03-24 11:11:42 +00:00
committed by ob-robot
parent 607b78760e
commit 16721c0bd0
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/logservice/replayservice/ob_log_replay_service.cpp
View File

@ -1278,6 +1278,7 @@ int ObLogReplayService::submit_log_replay_task_(ObLogReplayTask &replay_task,
ObReplayStatus &replay_status) ObReplayStatus &replay_status)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
int tmp_ret = OB_SUCCESS;
int64_t replay_hint = 0; int64_t replay_hint = 0;
if (OB_UNLIKELY(!replay_task.is_valid())) { if (OB_UNLIKELY(!replay_task.is_valid())) {
ret = OB_INVALID_ARGUMENT; ret = OB_INVALID_ARGUMENT;
@ -1293,8 +1294,11 @@ int ObLogReplayService::submit_log_replay_task_(ObLogReplayTask &replay_task,
} else { } else {
// push error, dec pending count now // push error, dec pending count now
if (replay_task.is_post_barrier_) { if (replay_task.is_post_barrier_) {
if (OB_FAIL(replay_status.set_post_barrier_finished(replay_task.lsn_))) { if (OB_SUCCESS != (tmp_ret = replay_status.set_post_barrier_finished(replay_task.lsn_))) {
CLOG_LOG(ERROR, "revoke post barrier failed", K(replay_task), K(replay_status), K(ret)); if (!replay_status.is_fatal_error(ret)) {
ret = tmp_ret;
}
CLOG_LOG(ERROR, "revoke post barrier failed", K(replay_task), K(replay_status), K(ret), K(tmp_ret));
} }
} }
replay_status.dec_pending_task(replay_task.log_size_); replay_status.dec_pending_task(replay_task.log_size_);

1
src/logservice/replayservice/ob_replay_status.cpp
View File

@ -1119,6 +1119,7 @@ int ObReplayStatus::push_log_replay_task(ObLogReplayTask &task)
} }
task_queues_[index].set_batch_push_finish(); task_queues_[index].set_batch_push_finish();
} }
CLOG_LOG(INFO, "broadcast push pre barrier log success", K(task));
} else { } else {
for (int64_t i = 1; i < broadcast_task_array.count(); ++i) { for (int64_t i = 1; i < broadcast_task_array.count(); ++i) {
free_replay_task(broadcast_task_array[i]); free_replay_task(broadcast_task_array[i]);