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

[CP] [CP][BUG.FIX] fix eating return code in tmp file.

Browse Source
This commit is contained in:
Tyshawn
2022-07-31 20:30:27 +08:00
committed by wangzelin.wzl
parent 4942b97c45
commit 8c74dc19a2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/storage/blocksstable/ob_tmp_file.cpp
View File

@ -621,7 +621,7 @@ int ObTmpFile::aio_read_without_lock(const ObTmpFileIOInfo &io_info, int64_t &of
ret = OB_ITER_END; ret = OB_ITER_END;
} else if (OB_FAIL(handle.prepare_read(io_info.size_, offset, io_info.io_desc_, io_info.buf_, this))) { } else if (OB_FAIL(handle.prepare_read(io_info.size_, offset, io_info.io_desc_, io_info.buf_, this))) {
STORAGE_LOG(WARN, "fail to prepare read io handle", K(ret), K(io_info), K(offset)); STORAGE_LOG(WARN, "fail to prepare read io handle", K(ret), K(io_info), K(offset));
} else if (once_aio_read_batch_without_lock(io_info, offset, handle)) { } else if (OB_FAIL(once_aio_read_batch_without_lock(io_info, offset, handle))) {
STORAGE_LOG(WARN, "fail to read one batch", K(ret), K(offset), K(handle)); STORAGE_LOG(WARN, "fail to read one batch", K(ret), K(offset), K(handle));
} else { } else {
handle.set_last_read_offset(offset); handle.set_last_read_offset(offset);
@ -648,7 +648,7 @@ int ObTmpFile::once_aio_read_batch(
STORAGE_LOG(WARN, "unexpected error, null tmp file extent", K(ret), KP(tmp), K(io_info)); STORAGE_LOG(WARN, "unexpected error, null tmp file extent", K(ret), KP(tmp), K(io_info));
} else if (OB_UNLIKELY(remain_size > 0 && offset >= tmp->get_global_end())) { } else if (OB_UNLIKELY(remain_size > 0 && offset >= tmp->get_global_end())) {
ret = OB_ITER_END; ret = OB_ITER_END;
} else if (once_aio_read_batch_without_lock(io_info, offset, handle)) { } else if (OB_FAIL(once_aio_read_batch_without_lock(io_info, offset, handle))) {
STORAGE_LOG(WARN, "fail to read one batch", K(ret), K(offset), K(handle)); STORAGE_LOG(WARN, "fail to read one batch", K(ret), K(offset), K(handle));
} else { } else {
handle.set_last_read_offset(offset); handle.set_last_read_offset(offset);