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

fix obtest

Browse Source
This commit is contained in:
obdev
2023-03-22 07:41:36 +00:00
committed by ob-robot
parent 9aaff0f5f8
commit d516a39c7c
2 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -238,17 +238,20 @@ int ObMediumCompactionScheduleFunc::schedule_next_medium_primary_cluster(
} else if (adaptive_merge_reason > ObAdaptiveMergePolicy::AdaptiveMergeReason::NONE) { } else if (adaptive_merge_reason > ObAdaptiveMergePolicy::AdaptiveMergeReason::NONE) {
schedule_medium_flag = true; schedule_medium_flag = true;
} }
LOG_DEBUG("schedule next medium in primary cluster", K(ret), KPC(this), K(schedule_medium_flag), LOG_TRACE("schedule next medium in primary cluster", K(ret), KPC(this), K(schedule_medium_flag),
K(schedule_major_snapshot), K(adaptive_merge_reason), KPC(last_major), K(medium_list), K(max_sync_medium_scn)); K(schedule_major_snapshot), K(adaptive_merge_reason), KPC(last_major), K(medium_list), K(max_sync_medium_scn));
#ifdef ERRSIM #ifdef ERRSIM
if (OB_SUCC(ret)) { if (OB_SUCC(ret)) {
if (tablet_.get_tablet_meta().tablet_id_.id() > ObTabletID::MIN_USER_TABLET_ID) {
ret = OB_E(EventTable::EN_SCHEDULE_MEDIUM_COMPACTION) ret; ret = OB_E(EventTable::EN_SCHEDULE_MEDIUM_COMPACTION) ret;
if (OB_FAIL(ret) && tablet_.get_tablet_meta().tablet_id_.id() > ObTabletID::MIN_USER_TABLET_ID) { LOG_INFO("errsim", K(ret), KPC(this));
if (OB_FAIL(ret)) {
FLOG_INFO("set schedule medium with errsim", KPC(this)); FLOG_INFO("set schedule medium with errsim", KPC(this));
ret = OB_SUCCESS; ret = OB_SUCCESS;
schedule_medium_flag = true; schedule_medium_flag = true;
} }
} }
}
#endif #endif
if (OB_FAIL(ret) || !schedule_medium_flag) { if (OB_FAIL(ret) || !schedule_medium_flag) {
@ -360,13 +363,16 @@ int ObMediumCompactionScheduleFunc::decide_medium_snapshot(
} }
} }
#ifdef ERRSIM #ifdef ERRSIM
if (OB_SUCC(ret)) { if (OB_SUCC(ret) || OB_NO_NEED_MERGE == ret) {
if (tablet_.get_tablet_meta().tablet_id_.id() > ObTabletID::MIN_USER_TABLET_ID) {
ret = OB_E(EventTable::EN_SCHEDULE_MEDIUM_COMPACTION) ret; ret = OB_E(EventTable::EN_SCHEDULE_MEDIUM_COMPACTION) ret;
if (OB_FAIL(ret) && tablet_.get_tablet_meta().tablet_id_.id() > ObTabletID::MIN_USER_TABLET_ID) { LOG_INFO("errsim", K(ret), KPC(this));
if (OB_FAIL(ret)) {
FLOG_INFO("set schedule medium with errsim", KPC(this)); FLOG_INFO("set schedule medium with errsim", KPC(this));
ret = OB_SUCCESS; ret = OB_SUCCESS;
} }
} }
}
#endif #endif
if (FAILEDx(prepare_medium_info(result, medium_info))) { if (FAILEDx(prepare_medium_info(result, medium_info))) {
if (OB_TABLE_IS_DELETED == ret) { if (OB_TABLE_IS_DELETED == ret) {

5
src/storage/compaction/ob_partition_merge_policy.cpp
View File

@ -1345,12 +1345,15 @@ int ObAdaptiveMergePolicy::find_meta_major_tables(
#ifdef ERRSIM #ifdef ERRSIM
if (OB_NO_NEED_MERGE == ret) { if (OB_NO_NEED_MERGE == ret) {
if (tablet.get_tablet_meta().tablet_id_.id() > ObTabletID::MIN_USER_TABLET_ID) {
ret = OB_E(EventTable::EN_SCHEDULE_MEDIUM_COMPACTION) ret; ret = OB_E(EventTable::EN_SCHEDULE_MEDIUM_COMPACTION) ret;
if (OB_FAIL(ret) && tablet.get_tablet_meta().tablet_id_.id() > ObTabletID::MIN_USER_TABLET_ID) { LOG_INFO("errsim", K(ret), "tablet_id", tablet.get_tablet_meta().tablet_id_);
if (OB_FAIL(ret)) {
FLOG_INFO("set schedule medium with errsim", "tablet_id", tablet.get_tablet_meta().tablet_id_); FLOG_INFO("set schedule medium with errsim", "tablet_id", tablet.get_tablet_meta().tablet_id_);
ret = OB_SUCCESS; ret = OB_SUCCESS;
} }
} }
}
#endif #endif
} }