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

add error code for tmp file seal

Browse Source
This commit is contained in:
wanyue-wy 2024-12-09 10:15:11 +00:00 committed by ob-robot
parent 43280b8d81
commit 0b88f81027
7 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
deps/oblib/src/lib/ob_errno.h vendored
View File

@ -430,6 +430,7 @@ constexpr int OB_OBJECT_STORAGE_PWRITE_OFFSET_NOT_MATCH = -9130;
constexpr int OB_OBJECT_STORAGE_PWRITE_CONTENT_NOT_MATCH = -9131;
constexpr int OB_OBJECT_STORAGE_CHECKSUM_ERROR = -9132;
constexpr int OB_BACKUP_ZONE_IDC_REGION_INVALID = -9133;
constexpr int OB_ERR_TMP_FILE_ALREADY_SEALED = -9134;
constexpr int OB_ERR_XML_PARSE = -9549;
constexpr int OB_ERR_XSLT_PARSE = -9574;
constexpr int OB_HDFS_CONNECT_FS_ERROR = -11019;

5
mittest/mtlenv/storage/tmp_file/test_tmp_file.cpp
View File

@ -1787,7 +1787,7 @@ TEST_F(TestTmpFile, test_aio_pread)
ASSERT_EQ(OB_SUCCESS, ret);
check_final_status();
STORAGE_LOG(INFO, "=======================test_aio_pread begin=======================");
STORAGE_LOG(INFO, "=======================test_aio_pread end=======================");
}
void rand_shrink_or_expand_wbp(ObTmpWriteBufferPool &wbp, bool &has_stop)
@ -1811,6 +1811,7 @@ void rand_shrink_or_expand_wbp(ObTmpWriteBufferPool &wbp, bool &has_stop)
TEST_F(TestTmpFile, test_multi_file_wr_when_wbp_shrink_and_expand)
{
STORAGE_LOG(INFO, "=======================test_multi_file_wr_when_wbp_shrink_and_expand begin=======================");
int ret = OB_SUCCESS;
ObTmpFilePageCacheController &pc_ctrl = MTL(ObTenantTmpFileManager *)->get_sn_file_manager().get_page_cache_controller();
ObTmpWriteBufferPool &wbp = pc_ctrl.write_buffer_pool_;
@ -1857,8 +1858,8 @@ TEST_F(TestTmpFile, test_multi_file_wr_when_wbp_shrink_and_expand)
ASSERT_EQ(wbp.default_wbp_memory_limit_, wbp.capacity_);
ASSERT_EQ(false, wbp.shrink_ctx_.is_valid());
LOG_INFO("test_multi_file_wr_when_wbp_shrink_and_expand");
LOG_INFO("io time", K(io_time));
STORAGE_LOG(INFO, "=======================test_multi_file_wr_when_wbp_shrink_and_expand end=======================");
}
} // namespace oceanbase

6
src/objit/src/ob_llvm_di_helper.cpp
View File

@ -434,9 +434,9 @@ ObLLVMDIHelper::ObDIBasicTypeAttr ObLLVMDIHelper::basic_type_[common::ObMaxType]
{"int unsigned", 32, 32, llvm::dwarf::DW_ATE_unsigned},
{"bigint unsigned", 64, 64, llvm::dwarf::DW_ATE_unsigned},
{"float", 32, 32, llvm::dwarf::DW_ATE_float},
{"double", 64, 64, llvm::dwarf::DW_ATE_float},
{"float unsigned", 32, 32, llvm::dwarf::DW_ATE_float},
{"double unsigned", 64, 64, llvm::dwarf::DW_ATE_float},
{"double", 64, 64, llvm::dwarf::DW_ATE_float},
{"float unsigned", 32, 32, llvm::dwarf::DW_ATE_float},
{"double unsigned", 64, 64, llvm::dwarf::DW_ATE_float},
{"decimal", 64, 64, llvm::dwarf::DW_ATE_address},
{"decimal unsigned", 64, 64, llvm::dwarf::DW_ATE_address},

17
src/share/ob_errno.cpp
View File

File diff suppressed because one or more lines are too long

2
src/share/ob_errno.def
View File

@ -2347,6 +2347,8 @@ DEFINE_ERROR_DEP(OB_OBJECT_STORAGE_PWRITE_OFFSET_NOT_MATCH, -9130, -1, "HY000",
DEFINE_ERROR_DEP(OB_OBJECT_STORAGE_PWRITE_CONTENT_NOT_MATCH, -9131, -1, "HY000", "the contents of pwrite are inconsistent");
DEFINE_ERROR_DEP(OB_OBJECT_STORAGE_CHECKSUM_ERROR, -9132, -1, "HY000", "object storage data checksum error");
DEFINE_ERROR_DEP(OB_BACKUP_ZONE_IDC_REGION_INVALID, -9133, -1, "HY000", "backup zone or backup idc or backup region invalid");
DEFINE_ERROR_DEP(OB_ERR_TMP_FILE_ALREADY_SEALED, -9134, -1, "HY000", "tmp file has already sealed");
// 余留位置，在该行之前继续添加storage错误码
////////////////////////////////////////////////////////////////

5
src/share/ob_errno.h
View File

@ -3940,6 +3940,7 @@ constexpr int OB_ERR_INVALID_DATE_MSG_FMT_V2 = -4219;
#define OB_OBJECT_STORAGE_PWRITE_CONTENT_NOT_MATCH__USER_ERROR_MSG "the contents of pwrite are inconsistent"
#define OB_OBJECT_STORAGE_CHECKSUM_ERROR__USER_ERROR_MSG "object storage data checksum error"
#define OB_BACKUP_ZONE_IDC_REGION_INVALID__USER_ERROR_MSG "backup zone or backup idc or backup region invalid"
#define OB_ERR_TMP_FILE_ALREADY_SEALED__USER_ERROR_MSG "tmp file has already sealed"
#define OB_ERR_RESIZE_FILE_TO_SMALLER__USER_ERROR_MSG "Extend ssblock file to smaller is not allowed"
#define OB_MARK_BLOCK_INFO_TIMEOUT__USER_ERROR_MSG "Mark blocks timeout(5s) in auto extend process when alloc block fail"
#define OB_NOT_READY_TO_EXTEND_FILE__USER_ERROR_MSG "Auto extend param is not ready to start extending file"
@ -8305,6 +8306,8 @@ constexpr int OB_ERR_INVALID_DATE_MSG_FMT_V2 = -4219;
#define OB_OBJECT_STORAGE_CHECKSUM_ERROR__OBE_USER_ERROR_MSG "OBE-00600: internal error code, arguments: -9132, object storage data checksum error"
#define OB_BACKUP_ZONE_IDC_REGION_INVALID__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -9133, backup zone or backup idc or backup region invalid"
#define OB_BACKUP_ZONE_IDC_REGION_INVALID__OBE_USER_ERROR_MSG "OBE-00600: internal error code, arguments: -9133, backup zone or backup idc or backup region invalid"
#define OB_ERR_TMP_FILE_ALREADY_SEALED__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -9134, tmp file has already sealed"
#define OB_ERR_TMP_FILE_ALREADY_SEALED__OBE_USER_ERROR_MSG "OBE-00600: internal error code, arguments: -9134, tmp file has already sealed"
#define OB_ERR_RESIZE_FILE_TO_SMALLER__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -9200, Extend ssblock file to smaller is not allowed"
#define OB_ERR_RESIZE_FILE_TO_SMALLER__OBE_USER_ERROR_MSG "OBE-00600: internal error code, arguments: -9200, Extend ssblock file to smaller is not allowed"
#define OB_MARK_BLOCK_INFO_TIMEOUT__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -9201, Mark blocks timeout(5s) in auto extend process when alloc block fail"
@ -9132,7 +9135,7 @@ constexpr int OB_ERR_INVALID_DATE_MSG_FMT_V2 = -4219;
#define OB_ERR_INVALID_DATE_MSG_FMT_V2__ORA_USER_ERROR_MSG "ORA-01861: Incorrect datetime value for column '%.*s' at row %ld"
#define OB_ERR_INVALID_DATE_MSG_FMT_V2__OBE_USER_ERROR_MSG "OBE-01861: Incorrect datetime value for column '%.*s' at row %ld"
extern int g_all_ob_errnos[2386];
extern int g_all_ob_errnos[2387];
const char *ob_error_name(const int oberr);
const char* ob_error_cause(const int oberr);

4
src/storage/tmp_file/ob_i_tmp_file.cpp
View File

@ -382,7 +382,7 @@ int ObITmpFile::seal()
} else {
ObSpinLockGuard write_guard(multi_write_lock_);
if (OB_UNLIKELY(is_sealed_)) {
ret = OB_ERR_UNEXPECTED;
ret = OB_ERR_TMP_FILE_ALREADY_SEALED;
LOG_WARN("tmp file has been sealed", KR(ret), KPC(this));
} else if (OB_FAIL(inner_seal_())) {
LOG_WARN("fail to seal", KR(ret), KPC(this));
@ -598,7 +598,7 @@ int ObITmpFile::aio_write(ObTmpFileIOCtx &io_ctx)
ret = OB_ERR_UNEXPECTED;
LOG_WARN("attempt to write a deleting file", KR(ret), K(fd_));
} else if (OB_UNLIKELY(is_sealed_)) {
ret = OB_ERR_UNEXPECTED;
ret = OB_ERR_TMP_FILE_ALREADY_SEALED;
LOG_WARN("attempt to write a sealed file", KR(ret), K(fd_));
} else {
bool is_unaligned_write = 0 != file_size_ % ObTmpFileGlobal::PAGE_SIZE ||