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 (backport #20873) #22135

Merged
mergify merged 4 commits into from
Dec 30, 2021
Merged

ClusterInfoVoteListener send only missing votes to BankingStage (backport #20873) #22135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
90d0ab9
ClusterInfoVoteListener send only missing votes to BankingStage (#20873)
carllin Nov 18, 2021
9e8a172
Resolve conflicts
carllin Dec 28, 2021
c20771c
Remove Select
carllin Dec 28, 2021
b6737e2
Fixup tests
carllin Dec 29, 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
289 changes: 233 additions & 56 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 @@ -4767,7 +4767,7 @@ 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 @@ -4796,7 +4796,7 @@ 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 @@ -4827,7 +4827,7 @@ 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 @@ -4850,7 +4850,7 @@ 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 @@ -4896,7 +4896,7 @@ 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 @@ -4952,7 +4952,7 @@ 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