From d30b9c421206cdabd7b15ba9f02d2700a81bc57f Mon Sep 17 00:00:00 2001
From: WenyXu <wenymedia@gmail.com>
Date: Mon, 16 Dec 2024 11:57:27 +0000
Subject: [PATCH] fix: correct `set_region_role_state_gracefully` behaviors

---
 src/metric-engine/src/engine.rs         | 8 +++++++-
 src/metric-engine/src/engine/catchup.rs | 3 +++
 src/mito2/src/worker/handle_catchup.rs  | 3 ++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/metric-engine/src/engine.rs b/src/metric-engine/src/engine.rs
index 86b64ddfae2a..15b94701139b 100644
--- a/src/metric-engine/src/engine.rs
+++ b/src/metric-engine/src/engine.rs
@@ -210,7 +210,6 @@ impl RegionEngine for MetricEngine {
         for x in [
             utils::to_metadata_region_id(region_id),
             utils::to_data_region_id(region_id),
-            region_id,
         ] {
             if let Err(e) = self.inner.mito.set_region_role(x, role)
                 && e.status_code() != StatusCode::RegionNotFound
@@ -226,6 +225,13 @@ impl RegionEngine for MetricEngine {
         region_id: RegionId,
         region_role_state: SettableRegionRoleState,
     ) -> std::result::Result<SetRegionRoleStateResponse, BoxedError> {
+        self.inner
+            .mito
+            .set_region_role_state_gracefully(
+                utils::to_metadata_region_id(region_id),
+                region_role_state,
+            )
+            .await?;
         self.inner
             .mito
             .set_region_role_state_gracefully(region_id, region_role_state)
diff --git a/src/metric-engine/src/engine/catchup.rs b/src/metric-engine/src/engine/catchup.rs
index 4b1268c049b5..783e1f009c0a 100644
--- a/src/metric-engine/src/engine/catchup.rs
+++ b/src/metric-engine/src/engine/catchup.rs
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use common_telemetry::debug;
 use snafu::ResultExt;
 use store_api::region_engine::RegionEngine;
 use store_api::region_request::{AffectedRows, RegionCatchupRequest, RegionRequest};
@@ -35,6 +36,7 @@ impl MetricEngineInner {
         }
         let metadata_region_id = utils::to_metadata_region_id(region_id);
         // TODO(weny): improve the catchup, we can read the wal entries only once.
+        debug!("Catchup metadata region {metadata_region_id}");
         self.mito
             .handle_request(
                 metadata_region_id,
@@ -48,6 +50,7 @@ impl MetricEngineInner {
             .context(MitoCatchupOperationSnafu)?;
 
         let data_region_id = utils::to_data_region_id(region_id);
+        debug!("Catchup data region {data_region_id}");
         self.mito
             .handle_request(
                 data_region_id,
diff --git a/src/mito2/src/worker/handle_catchup.rs b/src/mito2/src/worker/handle_catchup.rs
index f0fd6b05503c..8992621dd724 100644
--- a/src/mito2/src/worker/handle_catchup.rs
+++ b/src/mito2/src/worker/handle_catchup.rs
@@ -16,8 +16,8 @@
 
 use std::sync::Arc;
 
-use common_telemetry::info;
 use common_telemetry::tracing::warn;
+use common_telemetry::{debug, info};
 use snafu::ensure;
 use store_api::logstore::LogStore;
 use store_api::region_engine::RegionRole;
@@ -40,6 +40,7 @@ impl<S: LogStore> RegionWorkerLoop<S> {
         };
 
         if region.is_writable() {
+            debug!("Region {region_id} is writable, skip catchup");
             return Ok(0);
         }
         // Note: Currently, We protect the split brain by ensuring the mutable table is empty.