From 695ff1e03713c554b50eb9f6245dbebc8decb91c Mon Sep 17 00:00:00 2001 From: Weny Xu Date: Fri, 11 Oct 2024 10:40:51 +0800 Subject: [PATCH] feat: expose `RegionMigrationManagerRef` (#4812) * chore: expose `RegionMigrationProcedureTask` * fix: fix typos * chore: expose `tracker` --- src/meta-srv/src/procedure/region_migration.rs | 6 ++++-- src/meta-srv/src/procedure/region_migration/manager.rs | 4 ++-- src/meta-srv/src/region/supervisor.rs | 8 ++++---- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/meta-srv/src/procedure/region_migration.rs b/src/meta-srv/src/procedure/region_migration.rs index 9b5bdfc006..72b886418c 100644 --- a/src/meta-srv/src/procedure/region_migration.rs +++ b/src/meta-srv/src/procedure/region_migration.rs @@ -43,8 +43,10 @@ use common_procedure::error::{ Error as ProcedureError, FromJsonSnafu, Result as ProcedureResult, ToJsonSnafu, }; use common_procedure::{Context as ProcedureContext, LockKey, Procedure, Status, StringKey}; -pub use manager::RegionMigrationProcedureTask; -use manager::{RegionMigrationProcedureGuard, RegionMigrationProcedureTracker}; +use manager::RegionMigrationProcedureGuard; +pub use manager::{ + RegionMigrationManagerRef, RegionMigrationProcedureTask, RegionMigrationProcedureTracker, +}; use serde::{Deserialize, Serialize}; use snafu::{OptionExt, ResultExt}; use store_api::storage::RegionId; diff --git a/src/meta-srv/src/procedure/region_migration/manager.rs b/src/meta-srv/src/procedure/region_migration/manager.rs index 01ea887ca9..1059c1794a 100644 --- a/src/meta-srv/src/procedure/region_migration/manager.rs +++ b/src/meta-srv/src/procedure/region_migration/manager.rs @@ -44,7 +44,7 @@ pub struct RegionMigrationManager { } #[derive(Default, Clone)] -pub(crate) struct RegionMigrationProcedureTracker { +pub struct RegionMigrationProcedureTracker { running_procedures: Arc>>, } @@ -149,7 +149,7 @@ impl RegionMigrationManager { } /// Returns the [`RegionMigrationProcedureTracker`]. - pub(crate) fn tracker(&self) -> &RegionMigrationProcedureTracker { + pub fn tracker(&self) -> &RegionMigrationProcedureTracker { &self.tracker } diff --git a/src/meta-srv/src/region/supervisor.rs b/src/meta-srv/src/region/supervisor.rs index 8367acbb26..80f6c84865 100644 --- a/src/meta-srv/src/region/supervisor.rs +++ b/src/meta-srv/src/region/supervisor.rs @@ -223,7 +223,7 @@ impl RegionFailureDetectorController for RegionFailureDetectorControl { .send(Event::RegisterFailureDetectors(detecting_regions)) .await { - error!(err; "RegionSupervisor is stop receiving heartbeat"); + error!(err; "RegionSupervisor has stop receiving heartbeat."); } } @@ -233,7 +233,7 @@ impl RegionFailureDetectorController for RegionFailureDetectorControl { .send(Event::DeregisterFailureDetectors(detecting_regions)) .await { - error!(err; "RegionSupervisor is stop receiving heartbeat"); + error!(err; "RegionSupervisor has stop receiving heartbeat."); } } } @@ -251,13 +251,13 @@ impl HeartbeatAcceptor { /// Accepts heartbeats from datanodes. pub(crate) async fn accept(&self, heartbeat: DatanodeHeartbeat) { if let Err(err) = self.sender.send(Event::HeartbeatArrived(heartbeat)).await { - error!(err; "RegionSupervisor is stop receiving heartbeat"); + error!(err; "RegionSupervisor has stop receiving heartbeat."); } } } impl RegionSupervisor { - /// Returns a a mpsc channel with a buffer capacity of 1024 for sending and receiving `Event` messages. + /// Returns a mpsc channel with a buffer capacity of 1024 for sending and receiving `Event` messages. pub(crate) fn channel() -> (Sender, Receiver) { tokio::sync::mpsc::channel(1024) }