Skip to content
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.

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

v1.18: blockstore: relax parent slot meta check for clear_unconfirmed_slot #68

Merged
merged 1 commit into from
Mar 8, 2024

Conversation

AshwinSekar
Copy link

@AshwinSekar AshwinSekar commented Mar 4, 2024

backport of the relevant parts in solana-labs#35124

@AshwinSekar AshwinSekar requested a review from steviez March 4, 2024 20:27
@AshwinSekar AshwinSekar changed the title v1.18: blockstore: atomize slot clearing, relax parent slot meta check v1.18: blockstore: relax parent slot meta check Mar 4, 2024
@AshwinSekar AshwinSekar changed the title v1.18: blockstore: relax parent slot meta check v1.18: blockstore: relax parent slot meta check for clear_unconfirmed_slot Mar 4, 2024
Copy link

@steviez steviez left a comment

Choose a reason for hiding this comment

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

I'm good with this minimized BP for v1.18. The previous code could panic from this previous expect:

.expect("Unconfirmed slot should have had parent slot set");

which is now an error message. While we shouldn't hit the panic in regular operation, it is technically recoverable since ReplayStage (the caller of this function) is going to repair the slot it just purged, which will in turn populate the parent slot meta that was unable to be found.

I'm going to add @willhickey as a reviewer; let's confirm that Will is onboard with the BP as well before pushing

@codecov-commenter
Copy link

Codecov Report

Attention: Patch coverage is 85.71429% with 1 lines in your changes are missing coverage. Please review.

Project coverage is 81.6%. Comparing base (9b784a2) to head (a39e632).

Additional details and impacted files
@@            Coverage Diff            @@
##            v1.18      #68     +/-   ##
=========================================
- Coverage    81.6%    81.6%   -0.1%     
=========================================
  Files         827      827             
  Lines      224306   224311      +5     
=========================================
- Hits       183128   183117     -11     
- Misses      41178    41194     +16     

Copy link

@willhickey willhickey left a comment

Choose a reason for hiding this comment

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

:shipit: Approved for beta

@AshwinSekar AshwinSekar merged commit a6e731f into anza-xyz:v1.18 Mar 8, 2024
37 checks passed
@t-nelson
Copy link

t-nelson commented Mar 9, 2024

in the future, try to make changes with potential backportability in mind. it is much safer to take backports that are unmodified when possible

anwayde pushed a commit to firedancer-io/agave that referenced this pull request Jul 23, 2024
…_slot (anza-xyz#68)

blockstore: relax parent slot meta check for clear_unconfirmed_slot
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants