Skip to content

feat: add region_id to CountdownTaskHandlerExt #5834

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
WenyXu merged 1 commit into from
Apr 7, 2025
Merged

feat: add region_id to CountdownTaskHandlerExt #5834

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions src/datanode/src/alive_keeper.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,14 @@ pub struct RegionAliveKeeper {
/// duration acts like an "invariant point" for region's keep alive lease.
epoch: Instant,

countdown_task_ext_handler: Option<CountdownTaskHandlerExtRef>,
countdown_task_handler_ext: Option<CountdownTaskHandlerExtRef>,
}

impl RegionAliveKeeper {
/// Returns an empty [RegionAliveKeeper].
pub fn new(
region_server: RegionServer,
countdown_task_ext_handler: Option<CountdownTaskHandlerExtRef>,
countdown_task_handler_ext: Option<CountdownTaskHandlerExtRef>,
heartbeat_interval_millis: u64,
) -> Self {
Self {
Expand All @@ -75,7 +75,7 @@ impl RegionAliveKeeper {
heartbeat_interval_millis,
started: Arc::new(AtomicBool::new(false)),
epoch: Instant::now(),
countdown_task_ext_handler,
countdown_task_handler_ext,
}
}

Expand All @@ -92,7 +92,7 @@ impl RegionAliveKeeper {

let handle = Arc::new(CountdownTaskHandle::new(
self.region_server.clone(),
self.countdown_task_ext_handler.clone(),
self.countdown_task_handler_ext.clone(),
region_id,
));

Expand Down Expand Up @@ -282,14 +282,15 @@ enum CountdownCommand {
Deadline(oneshot::Sender<Instant>),
}

pub type CountdownTaskHandlerExtRef = Arc<dyn CountdownTaskExtHandler>;
pub type CountdownTaskHandlerExtRef = Arc<dyn CountdownTaskHandlerExt>;

/// Extension trait for [CountdownTaskHandle] to reset deadline method.
/// Extension trait for [CountdownTaskHandlerExt] to reset deadline of a region.
#[async_trait]
pub trait CountdownTaskExtHandler: Send + Sync {
pub trait CountdownTaskHandlerExt: Send + Sync {
async fn reset_deadline(
&self,
region_server: &RegionServer,
region_id: RegionId,
role: RegionRole,
deadline: Instant,
extension_info: HashMap<String, Vec<u8>>,
Expand Down Expand Up @@ -421,6 +422,7 @@ impl CountdownTask {
if let Some(ext_handler) = self.handler_ext.as_ref() {
ext_handler.reset_deadline(
&self.region_server,
self.region_id,
role,
deadline,
extension_info,
Expand Down