Skip to content

Gossip: fix time-based tiebreak in test_refresh_vote_eviction #11351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alexpyattaev merged 1 commit into from
Mar 17, 2026
Merged

Gossip: fix time-based tiebreak in test_refresh_vote_eviction #11351

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions gossip/src/cluster_info.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2986,7 +2986,7 @@ mod tests {
let max_vote_slot = lowest_vote_slot + MAX_LOCKOUT_HISTORY as Slot;
let mut first_vote = None;
let mut prev_votes = vec![];
for slot in 1..max_vote_slot {
for slot in lowest_vote_slot..max_vote_slot {
Copy link
Copy Markdown
Author

@alexpyattaev alexpyattaev Mar 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changed to lowest_vote_slot to match what the variable is actually set to a few lines above.

prev_votes.push(slot);
let unrefresh_vote = Vote::new(vec![slot], Hash::new_unique());
let vote_ix = vote_instruction::vote(
Expand All @@ -3002,8 +3002,16 @@ mod tests {
first_vote = Some(vote_tx.clone());
}
cluster_info.push_vote(&prev_votes, vote_tx);
// Sleep to avoid votes with same timestamp causing the insert to
// fail when wallclocks collide (find_vote_index_to_evict breaks
// ties by ms timestamp during eviction).
// Since we only store MAX_VOTES, when conflict occurs we may end up evicting
// the newer votes if all timestamps are the same.
std::thread::sleep(Duration::from_millis(2));
}

// We should now have the MAX_VOTES most recent votes in CRDS, for slots
// [max_vote_slot - MAX_VOTES, max_vote_slot)
let initial_votes = cluster_info.get_votes(&mut Cursor::default());
assert_eq!(initial_votes.len(), MAX_VOTES as usize);

Expand All @@ -3022,7 +3030,10 @@ mod tests {
cluster_info.refresh_vote(refresh_tx.clone(), refresh_slot);
let current_votes = cluster_info.get_votes(&mut Cursor::default());
assert_eq!(initial_votes, current_votes);
assert!(!current_votes.contains(&refresh_tx));
assert!(
!current_votes.contains(&refresh_tx),
"Refresh on outdated vote should fail"
);

// Trying to refresh a vote should evict the first slot less than the refreshed vote slot
let refresh_slot = max_vote_slot + 1;
Expand All @@ -3041,7 +3052,7 @@ mod tests {
// This should evict the latest vote since it's for a slot less than refresh_slot
let votes = cluster_info.get_votes(&mut Cursor::default());
assert_eq!(votes.len(), MAX_VOTES as usize);
assert!(votes.contains(&refresh_tx));
assert!(votes.contains(&refresh_tx), "Refresh vote not found");
assert!(!votes.contains(&first_vote.unwrap()));
}

Expand Down
Loading