This repository has been archived by the owner on Jan 22, 2025. It is now read-only.
Update is_locked_out cache when adopting on chain vote state #33341
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
AshwinSekar
commented
Sep 21, 2023
AshwinSekar
force-pushed
the
tower-sync-last-vote
branch
2 times, most recently
from
e167aca to
9558abd
Compare
Codecov Report
@@ Coverage Diff @@
## master #33341 +/- ##
=======================================
Coverage 81.9% 81.9%
=======================================
Files 798 798
Lines 216579 216642 +63
=======================================
+ Hits 177481 177572 +91
+ Misses 39098 39070 -28 |
carllin
reviewed
Sep 22, 2023
core/src/replay_stage.rs
Outdated
Comment on lines
3177
to
3186
| for slot in frozen_banks.iter().map(|b| b.slot()) { | ||
| let stats = progress | ||
| .get_fork_stats_mut(slot) | ||
| .expect("All frozen banks must exist in the Progress map"); | ||
| stats.is_locked_out = tower.is_locked_out( | ||
| slot, | ||
| ancestors | ||
| .get(&slot) | ||
| .expect("Ancestors map should contain slot for is_locked_out() check"), | ||
| ); |
There was a problem hiding this comment.
this is a good catch!
Don't all of these tower based checks
solana/core/src/replay_stage.rs
Lines 3252 to 3261 in 9558abd
Might be easier to move all those tower-based checks into a separate function that we can call from both places so that we don't miss this in the future for any added checks
There was a problem hiding this comment.
good catch, added all of these as well
AshwinSekar
force-pushed
the
tower-sync-last-vote
branch
from
9558abd to
d897b2f
Compare
AshwinSekar
force-pushed
the
tower-sync-last-vote
branch
from
d897b2f to
8f00433
Compare
carllin
approved these changes
Sep 25, 2023
mergify bot
pushed a commit
that referenced
this pull request
Sep 25, 2023
* Update is_locked_out cache when adopting on chain vote state * extend to all cached tower checks * upgrade error to panic (cherry picked from commit 85cc6ac) # Conflicts: # core/src/consensus.rs
mergify bot
pushed a commit
that referenced
this pull request
Sep 25, 2023
* Update is_locked_out cache when adopting on chain vote state * extend to all cached tower checks * upgrade error to panic (cherry picked from commit 85cc6ac) # Conflicts: # core/src/consensus.rs
This was referenced Sep 25, 2023
Merged
AshwinSekar
added a commit
that referenced
this pull request
Sep 26, 2023
…backport of #33341) (#33402) * Update is_locked_out cache when adopting on chain vote state (#33341) * Update is_locked_out cache when adopting on chain vote state * extend to all cached tower checks * upgrade error to panic (cherry picked from commit 85cc6ac) # Conflicts: # core/src/consensus.rs * Fix conflicts --------- Co-authored-by: Ashwin Sekar <[email protected]>
AshwinSekar
added a commit
that referenced
this pull request
Sep 26, 2023
…backport of #33341) (#33403) * Update is_locked_out cache when adopting on chain vote state (#33341) * Update is_locked_out cache when adopting on chain vote state * extend to all cached tower checks * upgrade error to panic (cherry picked from commit 85cc6ac) # Conflicts: # core/src/consensus.rs * Fix conflicts --------- Co-authored-by: Ashwin Sekar <[email protected]>
bw-solana
pushed a commit
to bw-solana/solana
that referenced
this pull request
Jan 10, 2025
…backport of solana-labs#33341) (solana-labs#33402) * Update is_locked_out cache when adopting on chain vote state (solana-labs#33341) * Update is_locked_out cache when adopting on chain vote state * extend to all cached tower checks * upgrade error to panic (cherry picked from commit 85cc6ac) # Conflicts: # core/src/consensus.rs * Fix conflicts --------- Co-authored-by: Ashwin Sekar <[email protected]>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Problem
The
is_locked_outcache is not updated when we adopt the on chain vote state.This can cause a similar situation to #32880 (detailed in #32944) because we attempt to vote on a block we are locked out on which will fail.
Summary of Changes
Fixes #