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

Do not covert 4013 to 4009 in log file handle read path

Browse Source
This commit is contained in:
JiahuaChen
2023-01-10 02:38:13 +00:00
committed by ob-robot
parent 26108dd0d6
commit b2849080f6
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/share/redolog/ob_log_file_handler.cpp
View File

@ -290,6 +290,8 @@ int ObLogFileHandler::inner_read(const ObIOFd &io_fd, void *buf, const int64_t s
} else if (OB_DATA_OUT_OF_RANGE == ret) {
read_size = read_sz;
ret = OB_SUCCESS;
} else if (OB_ALLOCATE_MEMORY_FAILED == ret) {
LOG_WARN("underlying io memory not enough", K(ret), K(buf), K(read_sz), K(size), K(offset));
} else {
ret = OB_IO_ERROR;
LOG_ERROR("fail to read", K(ret), K(buf), K(read_sz), K(size), K(offset), K(errno));

2
src/storage/blocksstable/ob_shared_macro_block_manager.cpp
View File

@ -202,7 +202,7 @@ int ObSharedMacroBlockMgr::write_block(
LOG_WARN("fail to do write block", K(ret), K(write_info), K(block_info));
} else {
FLOG_INFO("successfully write small sstable",
K(ret), K(write_ctx.get_macro_block_list()), K(block_info), K(offset_));
K(ret), K(block_info), K(offset_), "old_block", write_ctx.get_macro_block_list());
write_ctx.reset();
if (OB_FAIL(write_ctx.add_macro_block_id(macro_handle_.get_macro_id()))) {
LOG_WARN("fail to add macro block id into write_ctx",