diff --git a/src/common/meta/src/key/table_route.rs b/src/common/meta/src/key/table_route.rs index 0be0aab3aae..c9990ab1212 100644 --- a/src/common/meta/src/key/table_route.rs +++ b/src/common/meta/src/key/table_route.rs @@ -744,6 +744,7 @@ mod tests { use crate::kv_backend::memory::MemoryKvBackend; use crate::kv_backend::{KvBackend, TxnService}; use crate::peer::Peer; + use crate::rpc::router::Region; use crate::rpc::store::PutRequest; #[test] @@ -751,11 +752,43 @@ mod tests { let old_raw_v = r#"{"region_routes":[{"region":{"id":1,"name":"r1","partition":null,"attrs":{}},"leader_peer":{"id":2,"addr":"a2"},"follower_peers":[]},{"region":{"id":1,"name":"r1","partition":null,"attrs":{}},"leader_peer":{"id":2,"addr":"a2"},"follower_peers":[]}],"version":0}"#; let v = TableRouteValue::try_from_raw_value(old_raw_v.as_bytes()).unwrap(); - let new_raw_v = format!("{:?}", v); - assert_eq!( - new_raw_v, - r#"Physical(PhysicalTableRouteValue { region_routes: [RegionRoute { region: Region { id: 1(0, 1), name: "r1", partition: None, attrs: {} }, leader_peer: Some(Peer { id: 2, addr: "a2" }), follower_peers: [], leader_status: None, leader_down_since: None }, RegionRoute { region: Region { id: 1(0, 1), name: "r1", partition: None, attrs: {} }, leader_peer: Some(Peer { id: 2, addr: "a2" }), follower_peers: [], leader_status: None, leader_down_since: None }], version: 0 })"# - ); + let expected_table_route = TableRouteValue::Physical(PhysicalTableRouteValue { + region_routes: vec![ + RegionRoute { + region: Region { + id: RegionId::new(0, 1), + name: "r1".to_string(), + partition: None, + attrs: Default::default(), + }, + leader_peer: Some(Peer { + id: 2, + addr: "a2".to_string(), + }), + follower_peers: vec![], + leader_state: None, + leader_down_since: None, + }, + RegionRoute { + region: Region { + id: RegionId::new(0, 1), + name: "r1".to_string(), + partition: None, + attrs: Default::default(), + }, + leader_peer: Some(Peer { + id: 2, + addr: "a2".to_string(), + }), + follower_peers: vec![], + leader_state: None, + leader_down_since: None, + }, + ], + version: 0, + }); + + assert_eq!(v, expected_table_route); } #[test] diff --git a/src/meta-srv/src/handler/region_lease_handler.rs b/src/meta-srv/src/handler/region_lease_handler.rs index 68624e8c353..5b1cebc33c9 100644 --- a/src/meta-srv/src/handler/region_lease_handler.rs +++ b/src/meta-srv/src/handler/region_lease_handler.rs @@ -352,7 +352,7 @@ mod test { assert_region_lease( acc, vec![ - GrantedRegion::new(region_id, RegionRole::Follower), + GrantedRegion::new(region_id, RegionRole::DowngradingLeader), GrantedRegion::new(another_region_id, RegionRole::Leader), ], ); diff --git a/src/meta-srv/src/region/lease_keeper.rs b/src/meta-srv/src/region/lease_keeper.rs index 8e9d17e94bf..9843be1543a 100644 --- a/src/meta-srv/src/region/lease_keeper.rs +++ b/src/meta-srv/src/region/lease_keeper.rs @@ -269,7 +269,7 @@ mod tests { // The downgraded leader region on the datanode. assert_eq!( renew_region_lease_via_region_route(®ion_route, leader_peer_id, region_id), - Some((region_id, RegionRole::Follower)) + Some((region_id, RegionRole::DowngradingLeader)) ); }