Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

ClusterInfoVoteListener send only missing votes to BankingStage #20873

Merged
carllin merged 13 commits into from
Nov 18, 2021
Merged

ClusterInfoVoteListener send only missing votes to BankingStage #20873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
8062d22
Add longer queue for votes
carllin Oct 22, 2021
6f0d6f2
Handle multiple sends per bank, add tests
carllin Oct 26, 2021
6b9ba86
Add iterator test
carllin Oct 26, 2021
0bfa3d4
Fixes
carllin Oct 27, 2021
a566f3d
Fix mismatched vote and node pubkey ids
carllin Oct 28, 2021
528c666
Add local cluster test
carllin Oct 29, 2021
69b841c
Remove labels from get_votes()
carllin Nov 4, 2021
d2647a0
Remove last_vote_sync
carllin Nov 4, 2021
9b0e134
Encapsulate logging/bank state in one single BankVoteSenderState struct
carllin Nov 4, 2021
7f8a72b
return on disconnected channel
carllin Nov 4, 2021
7ad8268
Refactor and add test, check poh recorder instead of Bannk::should_st…
carllin Nov 5, 2021
e2e14e4
Cleanup
carllin Nov 17, 2021
34577e1
Bump timeout on local cluster
carllin Nov 18, 2021
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
2 changes: 1 addition & 1 deletion ci/buildkite-pipeline.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ EOF

command_step "local-cluster" \
". ci/rust-version.sh; ci/docker-run.sh \$\$rust_stable_docker_image ci/test-local-cluster.sh" \
45
50
}

pull_or_push_steps() {
Expand Down
287 changes: 234 additions & 53 deletions core/src/cluster_info_vote_listener.rs
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions core/src/replay_stage.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5642,7 +5642,7 @@ pub mod tests {
);

let mut cursor = Cursor::default();
let (_, votes) = cluster_info.get_votes(&mut cursor);
let votes = cluster_info.get_votes(&mut cursor);
assert_eq!(votes.len(), 1);
let vote_tx = &votes[0];
assert_eq!(vote_tx.message.recent_blockhash, bank0.last_blockhash());
Expand Down Expand Up @@ -5671,7 +5671,7 @@ pub mod tests {
);

// No new votes have been submitted to gossip
let (_, votes) = cluster_info.get_votes(&mut cursor);
let votes = cluster_info.get_votes(&mut cursor);
assert!(votes.is_empty());
// Tower's latest vote tx blockhash hasn't changed either
assert_eq!(tower.last_vote_tx_blockhash(), bank0.last_blockhash());
Expand Down Expand Up @@ -5704,7 +5704,7 @@ pub mod tests {
vote_info,
false,
);
let (_, votes) = cluster_info.get_votes(&mut cursor);
let votes = cluster_info.get_votes(&mut cursor);
assert_eq!(votes.len(), 1);
let vote_tx = &votes[0];
assert_eq!(vote_tx.message.recent_blockhash, bank1.last_blockhash());
Expand All @@ -5727,7 +5727,7 @@ pub mod tests {
);

// No new votes have been submitted to gossip
let (_, votes) = cluster_info.get_votes(&mut cursor);
let votes = cluster_info.get_votes(&mut cursor);
assert!(votes.is_empty());
assert_eq!(tower.last_vote_tx_blockhash(), bank1.last_blockhash());
assert_eq!(tower.last_voted_slot().unwrap(), 1);
Expand Down Expand Up @@ -5774,7 +5774,7 @@ pub mod tests {
);

assert!(last_vote_refresh_time.last_refresh_time > clone_refresh_time);
let (_, votes) = cluster_info.get_votes(&mut cursor);
let votes = cluster_info.get_votes(&mut cursor);
assert_eq!(votes.len(), 1);
let vote_tx = &votes[0];
assert_eq!(
Expand Down Expand Up @@ -5830,7 +5830,7 @@ pub mod tests {
&voting_sender,
);

let (_, votes) = cluster_info.get_votes(&mut cursor);
let votes = cluster_info.get_votes(&mut cursor);
assert!(votes.is_empty());
assert_eq!(
vote_tx.message.recent_blockhash,
Expand Down
Loading