From d516a39c7cb34d5b6c1214991d341e44f0868df7 Mon Sep 17 00:00:00 2001
From: obdev <obdev@oceanbase.com>
Date: Wed, 22 Mar 2023 07:41:36 +0000
Subject: [PATCH] fix obtest

---
 .../compaction/ob_medium_compaction_func.cpp  | 28 +++++++++++--------
 .../compaction/ob_partition_merge_policy.cpp  | 11 +++++---
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/storage/compaction/ob_medium_compaction_func.cpp b/src/storage/compaction/ob_medium_compaction_func.cpp
index 8002f651f6..53c8aac66a 100644
--- a/src/storage/compaction/ob_medium_compaction_func.cpp
+++ b/src/storage/compaction/ob_medium_compaction_func.cpp
@@ -238,15 +238,18 @@ int ObMediumCompactionScheduleFunc::schedule_next_medium_primary_cluster(
   } else if (adaptive_merge_reason > ObAdaptiveMergePolicy::AdaptiveMergeReason::NONE) {
     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));
 #ifdef ERRSIM
   if (OB_SUCC(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) {
-      FLOG_INFO("set schedule medium with errsim", KPC(this));
-      ret = OB_SUCCESS;
-      schedule_medium_flag = true;
+    if (tablet_.get_tablet_meta().tablet_id_.id() > ObTabletID::MIN_USER_TABLET_ID) {
+      ret = OB_E(EventTable::EN_SCHEDULE_MEDIUM_COMPACTION) ret;
+      LOG_INFO("errsim", K(ret), KPC(this));
+      if (OB_FAIL(ret)) {
+        FLOG_INFO("set schedule medium with errsim", KPC(this));
+        ret = OB_SUCCESS;
+        schedule_medium_flag = true;
+      }
     }
   }
 #endif
@@ -360,11 +363,14 @@ int ObMediumCompactionScheduleFunc::decide_medium_snapshot(
       }
     }
 #ifdef ERRSIM
-  if (OB_SUCC(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) {
-      FLOG_INFO("set schedule medium with errsim", KPC(this));
-      ret = OB_SUCCESS;
+  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;
+      LOG_INFO("errsim", K(ret), KPC(this));
+      if (OB_FAIL(ret)) {
+        FLOG_INFO("set schedule medium with errsim", KPC(this));
+        ret = OB_SUCCESS;
+      }
     }
   }
 #endif
diff --git a/src/storage/compaction/ob_partition_merge_policy.cpp b/src/storage/compaction/ob_partition_merge_policy.cpp
index 0433b29c23..f530d118cc 100644
--- a/src/storage/compaction/ob_partition_merge_policy.cpp
+++ b/src/storage/compaction/ob_partition_merge_policy.cpp
@@ -1345,10 +1345,13 @@ int ObAdaptiveMergePolicy::find_meta_major_tables(
 
 #ifdef ERRSIM
   if (OB_NO_NEED_MERGE == 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) {
-      FLOG_INFO("set schedule medium with errsim", "tablet_id", tablet.get_tablet_meta().tablet_id_);
-      ret = OB_SUCCESS;
+    if (tablet.get_tablet_meta().tablet_id_.id() > ObTabletID::MIN_USER_TABLET_ID) {
+      ret = OB_E(EventTable::EN_SCHEDULE_MEDIUM_COMPACTION) ret;
+      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_);
+        ret = OB_SUCCESS;
+      }
     }
   }
 #endif
-- 
GitLab