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

[CP] fix errsim compilation failure

Browse Source
This commit is contained in:
WenJinyu
2023-01-09 09:38:07 +00:00
committed by ob-robot
parent 1a08e1d8f5
commit 2c2c8ec4d5
9 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/rootserver/backup/ob_backup_data_scheduler.cpp
View File

@ -1369,7 +1369,7 @@ int ObUserTenantBackupJobMgr::persist_set_task_()
#ifdef ERRSIM #ifdef ERRSIM
if (OB_SUCC(ret)) { if (OB_SUCC(ret)) {
ret = E(EventTable::EN_BACKUP_PERSIST_SET_TASK_FAILED) OB_SUCCESS; ret = OB_E(EventTable::EN_BACKUP_PERSIST_SET_TASK_FAILED) OB_SUCCESS;
} }
#endif #endif

2
src/rootserver/freeze/ob_checksum_validator.cpp
View File

@ -389,7 +389,7 @@ int ObIndexChecksumValidator::check_all_table_verification_finished(
data_compaction_info.all_index_verified_ = false; data_compaction_info.all_index_verified_ = false;
} else if (cur_compaction_info.is_compacted() && data_compaction_info.is_compacted()) { } else if (cur_compaction_info.is_compacted() && data_compaction_info.is_compacted()) {
#ifdef ERRSIM #ifdef ERRSIM
ret = E(EventTable::EN_MEDIUM_VERIFY_GROUP_SKIP_SET_VERIFY) OB_SUCCESS; ret = OB_E(EventTable::EN_MEDIUM_VERIFY_GROUP_SKIP_SET_VERIFY) OB_SUCCESS;
if (OB_FAIL(ret)) { if (OB_FAIL(ret)) {
if (!is_inner_table(table_id)) { if (!is_inner_table(table_id)) {
ret = OB_EAGAIN; ret = OB_EAGAIN;

2
src/storage/backup/ob_backup_reader.cpp
View File

@ -433,7 +433,7 @@ int ObMultiMacroBlockBackupReader::fetch_macro_block_with_retry_(
} }
#ifdef ERRSIM #ifdef ERRSIM
if (OB_SUCC(ret)) { if (OB_SUCC(ret)) {
ret = E(EventTable::EN_BACKUP_READ_MACRO_BLOCK_FAILED) OB_SUCCESS; ret = OB_E(EventTable::EN_BACKUP_READ_MACRO_BLOCK_FAILED) OB_SUCCESS;
if (OB_FAIL(ret)) { if (OB_FAIL(ret)) {
SERVER_EVENT_SYNC_ADD("backup", "fetch_macro_block_failed", SERVER_EVENT_SYNC_ADD("backup", "fetch_macro_block_failed",
"logic_id", logic_id); "logic_id", logic_id);

6
src/storage/compaction/ob_medium_compaction_func.cpp
View File

@ -558,7 +558,7 @@ int ObMediumCompactionScheduleFunc::submit_medium_clog(
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
#ifdef ERRSIM #ifdef ERRSIM
ret = E(EventTable::EN_MEDIUM_COMPACTION_SUBMIT_CLOG_FAILED) ret; ret = OB_E(EventTable::EN_MEDIUM_COMPACTION_SUBMIT_CLOG_FAILED) ret;
if (OB_FAIL(ret)) { if (OB_FAIL(ret)) {
LOG_INFO("set update medium clog failed with errsim", KPC(this)); LOG_INFO("set update medium clog failed with errsim", KPC(this));
return ret; return ret;
@ -654,7 +654,7 @@ int ObMediumCompactionScheduleFunc::check_medium_checksum_table(
} }
} }
#ifdef ERRSIM #ifdef ERRSIM
ret = E(EventTable::EN_MEDIUM_REPLICA_CHECKSUM_ERROR) OB_SUCCESS; ret = OB_E(EventTable::EN_MEDIUM_REPLICA_CHECKSUM_ERROR) OB_SUCCESS;
if (OB_FAIL(ret)) { if (OB_FAIL(ret)) {
STORAGE_LOG(INFO, "ERRSIM EN_MEDIUM_REPLICA_CHECKSUM_ERROR", K(ret), K(ls_id), K(tablet_id)); STORAGE_LOG(INFO, "ERRSIM EN_MEDIUM_REPLICA_CHECKSUM_ERROR", K(ret), K(ls_id), K(tablet_id));
} }
@ -716,7 +716,7 @@ int ObMediumCompactionScheduleFunc::schedule_tablet_medium_merge(
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
#ifdef ERRSIM #ifdef ERRSIM
ret = E(EventTable::EN_MEDIUM_CREATE_DAG) ret; ret = OB_E(EventTable::EN_MEDIUM_CREATE_DAG) ret;
if (OB_FAIL(ret)) { if (OB_FAIL(ret)) {
LOG_INFO("set create medium dag failed with errsim", K(ret)); LOG_INFO("set create medium dag failed with errsim", K(ret));
return ret; return ret;

2
src/storage/compaction/ob_tablet_merge_task.cpp
View File

@ -1394,7 +1394,7 @@ int ObTabletMergeTask::process()
ObTaskController::get().switch_task(share::ObTaskType::DATA_MAINTAIN); ObTaskController::get().switch_task(share::ObTaskType::DATA_MAINTAIN);
#ifdef ERRSIM #ifdef ERRSIM
ret = E(EventTable::EN_COMPACTION_MERGE_TASK) OB_SUCCESS; ret = OB_E(EventTable::EN_COMPACTION_MERGE_TASK) OB_SUCCESS;
if (OB_FAIL(ret)) { if (OB_FAIL(ret)) {
STORAGE_LOG(INFO, "ERRSIM EN_COMPACTION_MERGE_TASK"); STORAGE_LOG(INFO, "ERRSIM EN_COMPACTION_MERGE_TASK");
return ret; return ret;

2
src/storage/ddl/ob_build_index_task.cpp
View File

@ -969,7 +969,7 @@ int ObGlobalUniqueIndexCallback::operator()(const int ret_code)
arg.task_id_ = task_id_; arg.task_id_ = task_id_;
#ifdef ERRSIM #ifdef ERRSIM
if (OB_SUCC(ret)) { if (OB_SUCC(ret)) {
ret = E(EventTable::EN_DDL_REPORT_REPLICA_BUILD_STATUS_FAIL) OB_SUCCESS; ret = OB_E(EventTable::EN_DDL_REPORT_REPLICA_BUILD_STATUS_FAIL) OB_SUCCESS;
LOG_INFO("report replica build status errsim", K(ret)); LOG_INFO("report replica build status errsim", K(ret));
} }
#endif #endif

2
src/storage/ddl/ob_complement_data_task.cpp
View File

@ -535,7 +535,7 @@ int ObComplementDataDag::report_replica_build_status()
} else { } else {
#ifdef ERRSIM #ifdef ERRSIM
if (OB_SUCC(ret)) { if (OB_SUCC(ret)) {
ret = E(EventTable::EN_DDL_REPORT_REPLICA_BUILD_STATUS_FAIL) OB_SUCCESS; ret = OB_E(EventTable::EN_DDL_REPORT_REPLICA_BUILD_STATUS_FAIL) OB_SUCCESS;
LOG_INFO("report replica build status errsim", K(ret)); LOG_INFO("report replica build status errsim", K(ret));
} }
#endif #endif

2
src/storage/high_availability/ob_ls_migration_handler.cpp
View File

@ -1109,7 +1109,7 @@ int ObLSMigrationHandler::build_rebuild_task_()
#ifdef ERRSIM #ifdef ERRSIM
if (OB_SUCC(ret)) { if (OB_SUCC(ret)) {
ret = E(EventTable::EN_GENERATE_REBUILD_TASK_FAILED) OB_SUCCESS; ret = OB_E(EventTable::EN_GENERATE_REBUILD_TASK_FAILED) OB_SUCCESS;
if (OB_FAIL(ret)) { if (OB_FAIL(ret)) {
STORAGE_LOG(ERROR, "fake EN_GENERATE_REBUILD_TASK_FAILED", K(ret)); STORAGE_LOG(ERROR, "fake EN_GENERATE_REBUILD_TASK_FAILED", K(ret));
} }

4
src/storage/high_availability/ob_physical_copy_task.cpp
View File

@ -303,7 +303,7 @@ int ObPhysicalCopyTask::fetch_macro_block_(
#ifdef ERRSIM #ifdef ERRSIM
if (OB_SUCC(ret)) { if (OB_SUCC(ret)) {
ret = E(EventTable::EN_MIGRATE_FETCH_MACRO_BLOCK) OB_SUCCESS; ret = OB_E(EventTable::EN_MIGRATE_FETCH_MACRO_BLOCK) OB_SUCCESS;
if (OB_FAIL(ret)) { if (OB_FAIL(ret)) {
if (retry_times == 0) { if (retry_times == 0) {
} else { } else {
@ -1341,7 +1341,7 @@ int ObTabletCopyFinishTask::update_tablet_data_status_()
#ifdef ERRSIM #ifdef ERRSIM
if (OB_SUCC(ret)) { if (OB_SUCC(ret)) {
ret = E(EventTable::EN_UPDATE_TABLET_HA_STATUS_FAILED) OB_SUCCESS; ret = OB_E(EventTable::EN_UPDATE_TABLET_HA_STATUS_FAILED) OB_SUCCESS;
if (OB_FAIL(ret)) { if (OB_FAIL(ret)) {
STORAGE_LOG(ERROR, "fake EN_UPDATE_TABLET_HA_STATUS_FAILED", K(ret)); STORAGE_LOG(ERROR, "fake EN_UPDATE_TABLET_HA_STATUS_FAILED", K(ret));
} }