@@ -59,14 +59,14 @@ pub struct RegionAliveKeeper {
59
59
/// duration acts like an "invariant point" for region's keep alive lease.
60
60
epoch : Instant ,
61
61
62
- countdown_task_ext_handler : Option < CountdownTaskHandlerExtRef > ,
62
+ countdown_task_handler_ext : Option < CountdownTaskHandlerExtRef > ,
63
63
}
64
64
65
65
impl RegionAliveKeeper {
66
66
/// Returns an empty [RegionAliveKeeper].
67
67
pub fn new (
68
68
region_server : RegionServer ,
69
- countdown_task_ext_handler : Option < CountdownTaskHandlerExtRef > ,
69
+ countdown_task_handler_ext : Option < CountdownTaskHandlerExtRef > ,
70
70
heartbeat_interval_millis : u64 ,
71
71
) -> Self {
72
72
Self {
@@ -75,7 +75,7 @@ impl RegionAliveKeeper {
75
75
heartbeat_interval_millis,
76
76
started : Arc :: new ( AtomicBool :: new ( false ) ) ,
77
77
epoch : Instant :: now ( ) ,
78
- countdown_task_ext_handler ,
78
+ countdown_task_handler_ext ,
79
79
}
80
80
}
81
81
@@ -92,7 +92,7 @@ impl RegionAliveKeeper {
92
92
93
93
let handle = Arc :: new ( CountdownTaskHandle :: new (
94
94
self . region_server . clone ( ) ,
95
- self . countdown_task_ext_handler . clone ( ) ,
95
+ self . countdown_task_handler_ext . clone ( ) ,
96
96
region_id,
97
97
) ) ;
98
98
@@ -282,14 +282,15 @@ enum CountdownCommand {
282
282
Deadline ( oneshot:: Sender < Instant > ) ,
283
283
}
284
284
285
- pub type CountdownTaskHandlerExtRef = Arc < dyn CountdownTaskExtHandler > ;
285
+ pub type CountdownTaskHandlerExtRef = Arc < dyn CountdownTaskHandlerExt > ;
286
286
287
- /// Extension trait for [CountdownTaskHandle ] to reset deadline method .
287
+ /// Extension trait for [CountdownTaskHandlerExt ] to reset deadline of a region .
288
288
#[ async_trait]
289
- pub trait CountdownTaskExtHandler : Send + Sync {
289
+ pub trait CountdownTaskHandlerExt : Send + Sync {
290
290
async fn reset_deadline (
291
291
& self ,
292
292
region_server : & RegionServer ,
293
+ region_id : RegionId ,
293
294
role : RegionRole ,
294
295
deadline : Instant ,
295
296
extension_info : HashMap < String , Vec < u8 > > ,
@@ -421,6 +422,7 @@ impl CountdownTask {
421
422
if let Some ( ext_handler) = self . handler_ext. as_ref( ) {
422
423
ext_handler. reset_deadline(
423
424
& self . region_server,
425
+ self . region_id,
424
426
role,
425
427
deadline,
426
428
extension_info,
0 commit comments