Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: GreptimeTeam/greptimedb
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: aec6245ae98ed5291dde8203704c1a5128b84f84
Choose a base ref
..
head repository: GreptimeTeam/greptimedb
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c948c76cce874fd12e04f01c2d080e0740ac07a3
Choose a head ref
Showing with 11 additions and 11 deletions.
  1. +5 −5 src/meta-srv/src/handler/failure_handler.rs
  2. +6 −6 src/meta-srv/src/region/supervisor.rs
10 changes: 5 additions & 5 deletions src/meta-srv/src/handler/failure_handler.rs
Original file line number Diff line number Diff line change
@@ -18,17 +18,17 @@ use async_trait::async_trait;
use crate::error::Result;
use crate::handler::{HandleControl, HeartbeatAccumulator, HeartbeatHandler};
use crate::metasrv::Context;
use crate::region::supervisor::{DatanodeHeartbeat, HeartbeatAccepter, RegionSupervisor};
use crate::region::supervisor::{DatanodeHeartbeat, HeartbeatAcceptor, RegionSupervisor};

pub struct RegionFailureHandler {
heartbeat_accepter: HeartbeatAccepter,
heartbeat_acceptor: HeartbeatAcceptor,
}

impl RegionFailureHandler {
pub(crate) fn new(mut region_supervisor: RegionSupervisor) -> Self {
let heartbeat_accepter = region_supervisor.heartbeat_accepter();
let heartbeat_acceptor = region_supervisor.heartbeat_acceptor();
tokio::spawn(async move { region_supervisor.run().await });
Self { heartbeat_accepter }
Self { heartbeat_acceptor }
}
}

@@ -48,7 +48,7 @@ impl HeartbeatHandler for RegionFailureHandler {
return Ok(HandleControl::Continue);
};

self.heartbeat_accepter
self.heartbeat_acceptor
.accept(DatanodeHeartbeat::from(stat))
.await;

12 changes: 6 additions & 6 deletions src/meta-srv/src/region/supervisor.rs
Original file line number Diff line number Diff line change
@@ -163,12 +163,12 @@ pub struct RegionSupervisor {
table_metadata_manager: TableMetadataManagerRef,
}

/// [`HeartbeatAccepter`] forwards heartbeats to [`RegionSupervisor`].
pub(crate) struct HeartbeatAccepter {
/// [`HeartbeatAcceptor`] forwards heartbeats to [`RegionSupervisor`].
pub(crate) struct HeartbeatAcceptor {
sender: Sender<Event>,
}

impl HeartbeatAccepter {
impl HeartbeatAcceptor {
/// Accepts heartbeats from datanodes.
pub(crate) async fn accept(&self, heartbeat: DatanodeHeartbeat) {
if let Err(e) = self.sender.send(Event::HeartbeatArrived(heartbeat)).await {
@@ -208,9 +208,9 @@ impl RegionSupervisor {
}
}

/// Returns the [`HeartbeatAccepter`].
pub(crate) fn heartbeat_accepter(&self) -> HeartbeatAccepter {
HeartbeatAccepter {
/// Returns the [`HeartbeatAcceptor`].
pub(crate) fn heartbeat_acceptor(&self) -> HeartbeatAcceptor {
HeartbeatAcceptor {
sender: self.sender.clone(),
}
}