Make Blockstore populate TransactionStatusIndex entries #33756
Merged
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
steviez
changed the title
added 2 commits
October 19, 2023 21:31
A previous change removed logic that populated the TransactionStatusIndex entries at each of the legacy primary index keys (0 and 1). While these entries will not be read or written in the future, these entries are necessary for backwards compatibility. Namely, branches <= v1.17 expect these entries to be present and .unwrap()'s could fail if they are not. So, add the initialization of these entries back into Blockstore logic. We can remove initialization of these entries once our stable and beta branches are both versions that do not expect these entries to be present (should be v1.18).
steviez
force-pushed
the
bstore_clean_up_my_mess
branch
from
2c09538 to
2cf244b
Compare
steviez
commented
Oct 19, 2023
| @@ -2152,7 +2163,7 @@ impl Blockstore { | |||
| highest_primary_index_slot = Some(meta.max_slot); | |||
| } | |||
| } | |||
| if highest_primary_index_slot.is_some() { | |||
| if highest_primary_index_slot.is_some_and(|slot| slot != 0) { | |||
There was a problem hiding this comment.
This feels a little dirty but couldn't think of a better way to do it.
There was a problem hiding this comment.
Yeah, really my fault for all the clean_slot_0 stuff, though. This wfm!
Codecov Report
@@ Coverage Diff @@
## master #33756 +/- ##
=======================================
Coverage 81.8% 81.8%
=======================================
Files 806 806
Lines 217913 217919 +6
=======================================
+ Hits 178286 178295 +9
+ Misses 39627 39624 -3 |
CriesofCarrots
approved these changes
Oct 19, 2023
| @@ -2152,7 +2163,7 @@ impl Blockstore { | |||
| highest_primary_index_slot = Some(meta.max_slot); | |||
| } | |||
| } | |||
| if highest_primary_index_slot.is_some() { | |||
| if highest_primary_index_slot.is_some_and(|slot| slot != 0) { | |||
There was a problem hiding this comment.
Yeah, really my fault for all the clean_slot_0 stuff, though. This wfm!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
I encountered this issue originally by:
Blockstorewith master (which does not insert these entries) ANDBlockstorewithsolana-ledger-toolwhich opens in Secondary (read-only mode)