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

cherry-pick from 3_1_x_release to 3.1_opensource_release

Browse Source
This commit is contained in:
obdev
2021-07-15 18:27:13 +08:00
committed by wangzelin.wzl
parent 2aa1574bc6
commit 51ee0c55b2
19 changed files with 246 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/archive/ob_archive_restore_engine.cpp
View File

@ -459,7 +459,7 @@ void ObArchiveRestoreEngine::handle(void* task)
if (is_io_fail_ret_code_(ret)) {
fetch_task->inc_io_fail_cnt();
if (fetch_task->get_io_fail_cnt() > MAX_FETCH_LOG_IO_FAIL_CNT) {
encount_fatal_err = true;
//encount_fatal_err = true;
LOG_ERROR("io fail too many times", "task", *fetch_task, KR(ret));
}
}
@ -806,7 +806,7 @@ int ObArchiveRestoreEngine::process_normal_clog_(const clog::ObLogEntry& log_ent
bool ObArchiveRestoreEngine::need_retry_ret_code_(const int ret)
{
return (OB_EAGAIN == ret || OB_OSS_ERROR == ret || OB_IO_ERROR == ret);
return (OB_EAGAIN == ret || OB_OSS_ERROR == ret || OB_IO_ERROR == ret || OB_ALLOCATE_MEMORY_FAILED == ret || OB_IO_LIMIT == ret);
}
bool ObArchiveRestoreEngine::is_io_fail_ret_code_(const int ret)