rust/greptimedb
1
0
Fork 0
mirror of https://github.com/GreptimeTeam/greptimedb.git synced 2026-01-07 22:02:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: include follower peers in region distribution (#5844)

Browse Source
This commit is contained in:
Weny Xu
2025-04-10 17:19:32 +08:00
committed by GitHub
parent 74d8fd00a4
commit 382eacdc13
1 changed files with 44 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/common/meta/src/rpc/router.rs
View File

@@ -32,6 +32,10 @@ use crate::key::RegionDistribution;
use crate::peer::Peer; use crate::peer::Peer;
use crate::DatanodeId; use crate::DatanodeId;
/// Returns the distribution of regions to datanodes.
///
/// The distribution is a map of datanode id to a list of region ids.
/// The list of region ids is sorted in ascending order.
pub fn region_distribution(region_routes: &[RegionRoute]) -> RegionDistribution { pub fn region_distribution(region_routes: &[RegionRoute]) -> RegionDistribution {
let mut regions_id_map = RegionDistribution::new(); let mut regions_id_map = RegionDistribution::new();
for route in region_routes.iter() { for route in region_routes.iter() {
@@ -39,6 +43,10 @@ pub fn region_distribution(region_routes: &[RegionRoute]) -> RegionDistribution
let region_id = route.region.id.region_number(); let region_id = route.region.id.region_number();
regions_id_map.entry(peer.id).or_default().push(region_id); regions_id_map.entry(peer.id).or_default().push(region_id);
} }
for peer in route.follower_peers.iter() {
let region_id = route.region.id.region_number();
regions_id_map.entry(peer.id).or_default().push(region_id);
}
} }
for (_, regions) in regions_id_map.iter_mut() { for (_, regions) in regions_id_map.iter_mut() {
// id asc // id asc
@@ -550,4 +558,40 @@ mod tests {
assert_eq!(got, p); assert_eq!(got, p);
} }
#[test]
fn test_region_distribution() {
let region_routes = vec![
RegionRoute {
region: Region {
id: RegionId::new(1, 1),
name: "r1".to_string(),
partition: None,
attrs: BTreeMap::new(),
},
leader_peer: Some(Peer::new(1, "a1")),
follower_peers: vec![Peer::new(2, "a2"), Peer::new(3, "a3")],
leader_state: None,
leader_down_since: None,
},
RegionRoute {
region: Region {
id: RegionId::new(1, 2),
name: "r2".to_string(),
partition: None,
attrs: BTreeMap::new(),
},
leader_peer: Some(Peer::new(2, "a2")),
follower_peers: vec![Peer::new(1, "a1"), Peer::new(3, "a3")],
leader_state: None,
leader_down_since: None,
},
];
let distribution = region_distribution(&region_routes);
assert_eq!(distribution.len(), 3);
assert_eq!(distribution[&1], vec![1, 2]);
assert_eq!(distribution[&2], vec![1, 2]);
assert_eq!(distribution[&3], vec![1, 2]);
}
} }