From 91900ada8bd092ee6a50d1022b543fe11c0067f0 Mon Sep 17 00:00:00 2001
From: "Lei, HUANG" <mrsatangel@gmail.com>
Date: Sun, 3 May 2026 01:31:59 +0800
Subject: [PATCH] fix: reopen soft-dropped regions before purge

Signed-off-by: Lei, HUANG <mrsatangel@gmail.com>
---
 .../meta/src/ddl/purge_dropped_table.rs       | 27 +++++++++++++++++++
 src/common/meta/src/ddl/tests/drop_table.rs   | 13 ++++++---
 src/common/meta/src/ddl/undrop_table.rs       |  2 +-
 3 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/src/common/meta/src/ddl/purge_dropped_table.rs b/src/common/meta/src/ddl/purge_dropped_table.rs
index 2ddd6bb094..be73b02b04 100644
--- a/src/common/meta/src/ddl/purge_dropped_table.rs
+++ b/src/common/meta/src/ddl/purge_dropped_table.rs
@@ -24,10 +24,12 @@ use serde::{Deserialize, Serialize};
 use snafu::ResultExt;
 use store_api::storage::{RegionNumber, TableId};
 use strum::AsRefStr;
+use table::metadata::TableInfo;
 use table::table_name::TableName;
 
 use crate::ddl::DdlContext;
 use crate::ddl::drop_table::executor::DropTableExecutor;
+use crate::ddl::undrop_table::open_regions;
 use crate::ddl::utils::map_to_procedure_error;
 use crate::error::Result;
 use crate::key::table_route::TableRouteValue;
@@ -73,8 +75,25 @@ impl PurgeDroppedTableProcedure {
         };
         self.data.table_id = Some(dropped_table.table_id);
         self.data.table_name = Some(dropped_table.table_name);
+        self.data.table_info = Some(dropped_table.table_info_value.table_info);
         self.data.table_route_value = Some(dropped_table.table_route_value);
         self.data.region_wal_options = dropped_table.region_wal_options;
+        self.data.state = PurgeDroppedTableState::OpenRegions;
+        Ok(Status::executing(true))
+    }
+
+    async fn on_open_regions(&mut self) -> Result<Status> {
+        if let Some(region_routes) = self.data.physical_region_routes() {
+            open_regions(
+                &self.context,
+                self.data.table_id(),
+                self.data.table_name(),
+                self.data.table_info(),
+                region_routes,
+                &self.data.region_wal_options,
+            )
+            .await?;
+        }
         self.data.state = PurgeDroppedTableState::DropRegions;
         Ok(Status::executing(true))
     }
@@ -127,6 +146,7 @@ impl Procedure for PurgeDroppedTableProcedure {
     async fn execute(&mut self, _: &ProcedureContext) -> ProcedureResult<Status> {
         match self.data.state {
             PurgeDroppedTableState::Prepare => self.on_prepare().await,
+            PurgeDroppedTableState::OpenRegions => self.on_open_regions().await,
             PurgeDroppedTableState::DropRegions => self.on_drop_regions().await,
             PurgeDroppedTableState::DeleteTombstone => self.on_delete_tombstone().await,
         }
@@ -157,6 +177,7 @@ pub struct PurgeDroppedTableData {
     task: PurgeDroppedTableTask,
     table_id: Option<TableId>,
     table_name: Option<TableName>,
+    table_info: Option<TableInfo>,
     table_route_value: Option<TableRouteValue>,
     #[serde(default)]
     region_wal_options: HashMap<RegionNumber, WalOptions>,
@@ -169,6 +190,7 @@ impl PurgeDroppedTableData {
             task,
             table_id: None,
             table_name: None,
+            table_info: None,
             table_route_value: None,
             region_wal_options: HashMap::new(),
         }
@@ -182,6 +204,10 @@ impl PurgeDroppedTableData {
         self.table_name.as_ref().unwrap()
     }
 
+    fn table_info(&self) -> &TableInfo {
+        self.table_info.as_ref().unwrap()
+    }
+
     fn table_route_value(&self) -> &TableRouteValue {
         self.table_route_value.as_ref().unwrap()
     }
@@ -197,6 +223,7 @@ impl PurgeDroppedTableData {
 #[derive(Debug, Serialize, Deserialize, AsRefStr, PartialEq)]
 enum PurgeDroppedTableState {
     Prepare,
+    OpenRegions,
     DropRegions,
     DeleteTombstone,
 }
diff --git a/src/common/meta/src/ddl/tests/drop_table.rs b/src/common/meta/src/ddl/tests/drop_table.rs
index 0c9873613b..f4bcb29ef9 100644
--- a/src/common/meta/src/ddl/tests/drop_table.rs
+++ b/src/common/meta/src/ddl/tests/drop_table.rs
@@ -716,13 +716,14 @@ async fn test_purge_dropped_table_drops_regions_and_deletes_tombstone() {
     execute_procedure_until_done(&mut procedure).await;
 
     let mut requests = Vec::new();
-    for _ in 0..2 {
+    for _ in 0..3 {
         let (peer, request) = rx.try_recv().unwrap();
         requests.push((peer.id, request.body.unwrap()));
     }
     requests.sort_unstable_by_key(|(peer_id, _)| *peer_id);
-    assert_matches!(requests[0].1, region_request::Body::Drop(_));
-    assert_matches!(requests[1].1, region_request::Body::Close(_));
+    assert_matches!(requests[0].1, region_request::Body::Open(_));
+    assert_matches!(requests[1].1, region_request::Body::Drop(_));
+    assert_matches!(requests[2].1, region_request::Body::Close(_));
     assert!(
         ddl_context
             .table_metadata_manager
@@ -794,6 +795,12 @@ async fn test_purge_dropped_table_by_name_selects_tombstone_when_live_table_exis
         .unwrap();
     assert_eq!(live_table.table_id(), live_table_id);
 
+    let (_, request) = rx.try_recv().unwrap();
+    let Some(region_request::Body::Open(req)) = request.body else {
+        unreachable!();
+    };
+    assert_eq!(req.region_id, RegionId::new(dropped_table_id, 1).as_u64());
+
     let (_, request) = rx.try_recv().unwrap();
     let Some(region_request::Body::Drop(req)) = request.body else {
         unreachable!();
diff --git a/src/common/meta/src/ddl/undrop_table.rs b/src/common/meta/src/ddl/undrop_table.rs
index 9cbfce63c4..9d0ea734d7 100644
--- a/src/common/meta/src/ddl/undrop_table.rs
+++ b/src/common/meta/src/ddl/undrop_table.rs
@@ -188,7 +188,7 @@ impl Procedure for UndropTableProcedure {
     }
 }
 
-async fn open_regions(
+pub(crate) async fn open_regions(
     context: &DdlContext,
     table_id: TableId,
     table_name: &TableName,