From b2849080f6c0ffc7d9351c84a3da7f7360631c61 Mon Sep 17 00:00:00 2001 From: JiahuaChen Date: Tue, 10 Jan 2023 02:38:13 +0000 Subject: [PATCH] Do not covert 4013 to 4009 in log file handle read path --- src/share/redolog/ob_log_file_handler.cpp | 2 ++ src/storage/blocksstable/ob_shared_macro_block_manager.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/share/redolog/ob_log_file_handler.cpp b/src/share/redolog/ob_log_file_handler.cpp index c7c201757b..05c3ea3d6a 100644 --- a/src/share/redolog/ob_log_file_handler.cpp +++ b/src/share/redolog/ob_log_file_handler.cpp @@ -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)); diff --git a/src/storage/blocksstable/ob_shared_macro_block_manager.cpp b/src/storage/blocksstable/ob_shared_macro_block_manager.cpp index 38dda5de74..a89b233236 100644 --- a/src/storage/blocksstable/ob_shared_macro_block_manager.cpp +++ b/src/storage/blocksstable/ob_shared_macro_block_manager.cpp @@ -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",