gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-05-08 09:16:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

More improvements

Browse Source
This commit is contained in:
Mac L
2023-06-14 20:47:32 +10:00
parent f5154be207
commit d65967162a
2 changed files with 89 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

157
validator_client/src/beacon_node_fallback.rs
View File

@@ -621,116 +621,84 @@ mod tests {
#[test] #[test]
fn check_candidate_order() { fn check_candidate_order() {
let candidate_1: CandidateBeaconNode<E> = CandidateBeaconNode::new( fn new_candidate(id: usize) -> CandidateBeaconNode<E> {
BeaconNodeHttpClient::new( let beacon_node = BeaconNodeHttpClient::new(
SensitiveUrl::parse("http://example_1.com").unwrap(), SensitiveUrl::parse(&format!("http://example_{id}.com")).unwrap(),
Timeouts::set_all(Duration::from_secs(1)), Timeouts::set_all(Duration::from_secs(id as u64)),
), );
1, CandidateBeaconNode::new(beacon_node, id)
); }
let expected_candidate_1: CandidateBeaconNode<E> = CandidateBeaconNode::new(
BeaconNodeHttpClient::new(
SensitiveUrl::parse("http://example_1.com").unwrap(),
Timeouts::set_all(Duration::from_secs(1)),
),
1,
);
let candidate_2: CandidateBeaconNode<E> = CandidateBeaconNode::new(
BeaconNodeHttpClient::new(
SensitiveUrl::parse("http://example_2.com").unwrap(),
Timeouts::set_all(Duration::from_secs(2)),
),
2,
);
let expected_candidate_2: CandidateBeaconNode<E> = CandidateBeaconNode::new(
BeaconNodeHttpClient::new(
SensitiveUrl::parse("http://example_2.com").unwrap(),
Timeouts::set_all(Duration::from_secs(2)),
),
2,
);
let candidate_3: CandidateBeaconNode<E> = CandidateBeaconNode::new(
BeaconNodeHttpClient::new(
SensitiveUrl::parse("http://example_3.com").unwrap(),
Timeouts::set_all(Duration::from_secs(3)),
),
3,
);
let expected_candidate_3: CandidateBeaconNode<E> = CandidateBeaconNode::new(
BeaconNodeHttpClient::new(
SensitiveUrl::parse("http://example_3.com").unwrap(),
Timeouts::set_all(Duration::from_secs(3)),
),
3,
);
let candidate_4: CandidateBeaconNode<E> = CandidateBeaconNode::new(
BeaconNodeHttpClient::new(
SensitiveUrl::parse("http://example_4.com").unwrap(),
Timeouts::set_all(Duration::from_secs(4)),
),
3,
);
let expected_candidate_4: CandidateBeaconNode<E> = CandidateBeaconNode::new(
BeaconNodeHttpClient::new(
SensitiveUrl::parse("http://example_4.com").unwrap(),
Timeouts::set_all(Duration::from_secs(4)),
),
3,
);
let candidate_5: CandidateBeaconNode<E> = CandidateBeaconNode::new(
BeaconNodeHttpClient::new(
SensitiveUrl::parse("http://example_5.com").unwrap(),
Timeouts::set_all(Duration::from_secs(5)),
),
3,
);
let expected_candidate_5: CandidateBeaconNode<E> = CandidateBeaconNode::new(
BeaconNodeHttpClient::new(
SensitiveUrl::parse("http://example_5.com").unwrap(),
Timeouts::set_all(Duration::from_secs(5)),
),
3,
);
// All health parameters other than `health_tier` are irrelevant for ordering. // These fields is irrelvant for sorting. They are set to arbitrary values.
let head = Slot::new(99);
let optimistic_status = false;
let execution_status = ExecutionEngineHealth::Healthy;
let candidate_1 = new_candidate(1);
let expected_candidate_1 = new_candidate(1);
let candidate_2 = new_candidate(2);
let expected_candidate_2 = new_candidate(2);
let candidate_3 = new_candidate(3);
let expected_candidate_3 = new_candidate(3);
let candidate_4 = new_candidate(4);
let expected_candidate_4 = new_candidate(4);
let candidate_5 = new_candidate(5);
let expected_candidate_5 = new_candidate(5);
let candidate_6 = new_candidate(6);
let expected_candidate_6 = new_candidate(6);
let synced = SyncDistanceTier::Synced;
let small = SyncDistanceTier::Small;
// Despite `health_1` having a larger sync distance, it is inside the `synced` range which
// does not tie-break on sync distance and so will tie-break on `id` instead.
let health_1 = BeaconNodeHealth { let health_1 = BeaconNodeHealth {
id: 1, id: 1,
head: Slot::new(99), head,
optimistic_status: false, optimistic_status,
execution_status: ExecutionEngineHealth::Healthy, execution_status,
health_tier: BeaconNodeHealthTier::new(1, Slot::new(1)), health_tier: BeaconNodeHealthTier::new(1, Slot::new(2), synced),
}; };
let health_2 = BeaconNodeHealth { let health_2 = BeaconNodeHealth {
id: 2, id: 2,
head: Slot::new(99), head,
optimistic_status: false, optimistic_status,
execution_status: ExecutionEngineHealth::Healthy, execution_status,
health_tier: BeaconNodeHealthTier::new(2, Slot::new(1)), health_tier: BeaconNodeHealthTier::new(2, Slot::new(1), synced),
}; };
// `health_3` and `health_4` have the same health tier and sync distance so should
// tie-break on `id`.
let health_3 = BeaconNodeHealth { let health_3 = BeaconNodeHealth {
id: 3, id: 3,
head: Slot::new(99), head,
optimistic_status: false, optimistic_status,
execution_status: ExecutionEngineHealth::Healthy, execution_status,
health_tier: BeaconNodeHealthTier::new(3, Slot::new(1)), health_tier: BeaconNodeHealthTier::new(3, Slot::new(8), small),
}; };
let health_4 = BeaconNodeHealth { let health_4 = BeaconNodeHealth {
id: 4, id: 4,
head: Slot::new(99), head,
optimistic_status: false, optimistic_status,
execution_status: ExecutionEngineHealth::Healthy, execution_status,
health_tier: BeaconNodeHealthTier::new(4, Slot::new(1)), health_tier: BeaconNodeHealthTier::new(3, Slot::new(8), small),
}; };
// `health_5` has a smaller sync distance and is outside the `synced` range so should be
// sorted first.
let health_5 = BeaconNodeHealth { let health_5 = BeaconNodeHealth {
id: 5, id: 5,
head: Slot::new(99), head,
optimistic_status: false, optimistic_status,
execution_status: ExecutionEngineHealth::Unhealthy, execution_status,
health_tier: BeaconNodeHealthTier::new(4, Slot::new(5)), health_tier: BeaconNodeHealthTier::new(4, Slot::new(8), small),
};
let health_6 = BeaconNodeHealth {
id: 6,
head,
optimistic_status,
execution_status,
health_tier: BeaconNodeHealthTier::new(4, Slot::new(9), small),
}; };
*candidate_1.health.write() = Some(health_1); *candidate_1.health.write() = Some(health_1);
@@ -738,9 +706,11 @@ mod tests {
*candidate_3.health.write() = Some(health_3); *candidate_3.health.write() = Some(health_3);
*candidate_4.health.write() = Some(health_4); *candidate_4.health.write() = Some(health_4);
*candidate_5.health.write() = Some(health_5); *candidate_5.health.write() = Some(health_5);
*candidate_6.health.write() = Some(health_6);
let mut candidates = vec![ let mut candidates = vec![
candidate_3, candidate_3,
candidate_6,
candidate_5, candidate_5,
candidate_1, candidate_1,
candidate_4, candidate_4,
@@ -752,6 +722,7 @@ mod tests {
expected_candidate_3, expected_candidate_3,
expected_candidate_4, expected_candidate_4,
expected_candidate_5, expected_candidate_5,
expected_candidate_6,
]; ];
candidates.sort(); candidates.sort();

45
validator_client/src/beacon_node_health.rs
View File

@@ -15,7 +15,7 @@ type SyncDistance = Slot;
type OptimisticStatus = bool; type OptimisticStatus = bool;
/// Helpful enum which is used when pattern matching to determine health tier. /// Helpful enum which is used when pattern matching to determine health tier.
#[derive(PartialEq, Debug)] #[derive(Copy, Clone, Debug, PartialEq, Eq)]
pub enum SyncDistanceTier { pub enum SyncDistanceTier {
Synced, Synced,
Small, Small,
@@ -88,6 +88,7 @@ pub enum ExecutionEngineHealth {
pub struct BeaconNodeHealthTier { pub struct BeaconNodeHealthTier {
pub tier: HealthTier, pub tier: HealthTier,
pub sync_distance: SyncDistance, pub sync_distance: SyncDistance,
pub distance_tier: SyncDistanceTier,
} }
impl Display for BeaconNodeHealthTier { impl Display for BeaconNodeHealthTier {
@@ -100,8 +101,7 @@ impl Ord for BeaconNodeHealthTier {
fn cmp(&self, other: &Self) -> Ordering { fn cmp(&self, other: &Self) -> Ordering {
let ordering = self.tier.cmp(&other.tier); let ordering = self.tier.cmp(&other.tier);
if ordering == Ordering::Equal { if ordering == Ordering::Equal {
// These tiers represent `synced`. if self.distance_tier == SyncDistanceTier::Synced {
if [1, 3, 5, 6].contains(&self.tier) {
// Don't tie-break on sync distance in these cases. // Don't tie-break on sync distance in these cases.
// This ensures validator clients don't artificially prefer one node. // This ensures validator clients don't artificially prefer one node.
ordering ordering
@@ -121,10 +121,15 @@ impl PartialOrd for BeaconNodeHealthTier {
} }
impl BeaconNodeHealthTier { impl BeaconNodeHealthTier {
pub fn new(tier: HealthTier, sync_distance: SyncDistance) -> Self { pub fn new(
tier: HealthTier,
sync_distance: SyncDistance,
distance_tier: SyncDistanceTier,
) -> Self {
Self { Self {
tier, tier,
sync_distance, sync_distance,
distance_tier,
} }
} }
} }
@@ -218,52 +223,52 @@ impl BeaconNodeHealth {
match health { match health {
(SyncDistanceTier::Synced, false, ExecutionEngineHealth::Healthy) => { (SyncDistanceTier::Synced, false, ExecutionEngineHealth::Healthy) => {
BeaconNodeHealthTier::new(1, sync_distance) BeaconNodeHealthTier::new(1, sync_distance, sync_distance_tier)
} }
(SyncDistanceTier::Small, false, ExecutionEngineHealth::Healthy) => { (SyncDistanceTier::Small, false, ExecutionEngineHealth::Healthy) => {
BeaconNodeHealthTier::new(2, sync_distance) BeaconNodeHealthTier::new(2, sync_distance, sync_distance_tier)
} }
(SyncDistanceTier::Synced, false, ExecutionEngineHealth::Unhealthy) => { (SyncDistanceTier::Synced, false, ExecutionEngineHealth::Unhealthy) => {
BeaconNodeHealthTier::new(3, sync_distance) BeaconNodeHealthTier::new(3, sync_distance, sync_distance_tier)
} }
(SyncDistanceTier::Medium, false, ExecutionEngineHealth::Healthy) => { (SyncDistanceTier::Medium, false, ExecutionEngineHealth::Healthy) => {
BeaconNodeHealthTier::new(4, sync_distance) BeaconNodeHealthTier::new(4, sync_distance, sync_distance_tier)
} }
(SyncDistanceTier::Synced, true, ExecutionEngineHealth::Healthy) => { (SyncDistanceTier::Synced, true, ExecutionEngineHealth::Healthy) => {
BeaconNodeHealthTier::new(5, sync_distance) BeaconNodeHealthTier::new(5, sync_distance, sync_distance_tier)
} }
(SyncDistanceTier::Synced, true, ExecutionEngineHealth::Unhealthy) => { (SyncDistanceTier::Synced, true, ExecutionEngineHealth::Unhealthy) => {
BeaconNodeHealthTier::new(6, sync_distance) BeaconNodeHealthTier::new(6, sync_distance, sync_distance_tier)
} }
(SyncDistanceTier::Small, false, ExecutionEngineHealth::Unhealthy) => { (SyncDistanceTier::Small, false, ExecutionEngineHealth::Unhealthy) => {
BeaconNodeHealthTier::new(7, sync_distance) BeaconNodeHealthTier::new(7, sync_distance, sync_distance_tier)
} }
(SyncDistanceTier::Small, true, ExecutionEngineHealth::Healthy) => { (SyncDistanceTier::Small, true, ExecutionEngineHealth::Healthy) => {
BeaconNodeHealthTier::new(8, sync_distance) BeaconNodeHealthTier::new(8, sync_distance, sync_distance_tier)
} }
(SyncDistanceTier::Small, true, ExecutionEngineHealth::Unhealthy) => { (SyncDistanceTier::Small, true, ExecutionEngineHealth::Unhealthy) => {
BeaconNodeHealthTier::new(9, sync_distance) BeaconNodeHealthTier::new(9, sync_distance, sync_distance_tier)
} }
(SyncDistanceTier::Large, false, ExecutionEngineHealth::Healthy) => { (SyncDistanceTier::Large, false, ExecutionEngineHealth::Healthy) => {
BeaconNodeHealthTier::new(10, sync_distance) BeaconNodeHealthTier::new(10, sync_distance, sync_distance_tier)
} }
(SyncDistanceTier::Medium, false, ExecutionEngineHealth::Unhealthy) => { (SyncDistanceTier::Medium, false, ExecutionEngineHealth::Unhealthy) => {
BeaconNodeHealthTier::new(11, sync_distance) BeaconNodeHealthTier::new(11, sync_distance, sync_distance_tier)
} }
(SyncDistanceTier::Medium, true, ExecutionEngineHealth::Healthy) => { (SyncDistanceTier::Medium, true, ExecutionEngineHealth::Healthy) => {
BeaconNodeHealthTier::new(12, sync_distance) BeaconNodeHealthTier::new(12, sync_distance, sync_distance_tier)
} }
(SyncDistanceTier::Medium, true, ExecutionEngineHealth::Unhealthy) => { (SyncDistanceTier::Medium, true, ExecutionEngineHealth::Unhealthy) => {
BeaconNodeHealthTier::new(13, sync_distance) BeaconNodeHealthTier::new(13, sync_distance, sync_distance_tier)
} }
(SyncDistanceTier::Large, false, ExecutionEngineHealth::Unhealthy) => { (SyncDistanceTier::Large, false, ExecutionEngineHealth::Unhealthy) => {
BeaconNodeHealthTier::new(14, sync_distance) BeaconNodeHealthTier::new(14, sync_distance, sync_distance_tier)
} }
(SyncDistanceTier::Large, true, ExecutionEngineHealth::Healthy) => { (SyncDistanceTier::Large, true, ExecutionEngineHealth::Healthy) => {
BeaconNodeHealthTier::new(15, sync_distance) BeaconNodeHealthTier::new(15, sync_distance, sync_distance_tier)
} }
(SyncDistanceTier::Large, true, ExecutionEngineHealth::Unhealthy) => { (SyncDistanceTier::Large, true, ExecutionEngineHealth::Unhealthy) => {
BeaconNodeHealthTier::new(16, sync_distance) BeaconNodeHealthTier::new(16, sync_distance, sync_distance_tier)
} }
} }
} }