Skip to content

Commit 8748bf8

Browse files
WenyXuzyy17
authored andcommitted
feat: add region_id to CountdownTaskHandlerExt (GreptimeTeam#5834)
1 parent 5184bd8 commit 8748bf8

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

src/datanode/src/alive_keeper.rs

+9-7
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@ pub struct RegionAliveKeeper {
5959
/// duration acts like an "invariant point" for region's keep alive lease.
6060
epoch: Instant,
6161

62-
countdown_task_ext_handler: Option<CountdownTaskHandlerExtRef>,
62+
countdown_task_handler_ext: Option<CountdownTaskHandlerExtRef>,
6363
}
6464

6565
impl RegionAliveKeeper {
6666
/// Returns an empty [RegionAliveKeeper].
6767
pub fn new(
6868
region_server: RegionServer,
69-
countdown_task_ext_handler: Option<CountdownTaskHandlerExtRef>,
69+
countdown_task_handler_ext: Option<CountdownTaskHandlerExtRef>,
7070
heartbeat_interval_millis: u64,
7171
) -> Self {
7272
Self {
@@ -75,7 +75,7 @@ impl RegionAliveKeeper {
7575
heartbeat_interval_millis,
7676
started: Arc::new(AtomicBool::new(false)),
7777
epoch: Instant::now(),
78-
countdown_task_ext_handler,
78+
countdown_task_handler_ext,
7979
}
8080
}
8181

@@ -92,7 +92,7 @@ impl RegionAliveKeeper {
9292

9393
let handle = Arc::new(CountdownTaskHandle::new(
9494
self.region_server.clone(),
95-
self.countdown_task_ext_handler.clone(),
95+
self.countdown_task_handler_ext.clone(),
9696
region_id,
9797
));
9898

@@ -282,14 +282,15 @@ enum CountdownCommand {
282282
Deadline(oneshot::Sender<Instant>),
283283
}
284284

285-
pub type CountdownTaskHandlerExtRef = Arc<dyn CountdownTaskExtHandler>;
285+
pub type CountdownTaskHandlerExtRef = Arc<dyn CountdownTaskHandlerExt>;
286286

287-
/// Extension trait for [CountdownTaskHandle] to reset deadline method.
287+
/// Extension trait for [CountdownTaskHandlerExt] to reset deadline of a region.
288288
#[async_trait]
289-
pub trait CountdownTaskExtHandler: Send + Sync {
289+
pub trait CountdownTaskHandlerExt: Send + Sync {
290290
async fn reset_deadline(
291291
&self,
292292
region_server: &RegionServer,
293+
region_id: RegionId,
293294
role: RegionRole,
294295
deadline: Instant,
295296
extension_info: HashMap<String, Vec<u8>>,
@@ -421,6 +422,7 @@ impl CountdownTask {
421422
if let Some(ext_handler) = self.handler_ext.as_ref() {
422423
ext_handler.reset_deadline(
423424
&self.region_server,
425+
self.region_id,
424426
role,
425427
deadline,
426428
extension_info,

0 commit comments

Comments
 (0)