This repository has been archived by the owner on Jan 22, 2025. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 4.6k
Fix blockstore empty panic #11423
Merged
mergify
merged 6 commits into
solana-labs:master
from
CriesofCarrots:fix-blockstore-empty-panic
Aug 6, 2020
Merged
Fix blockstore empty panic #11423
mergify
merged 6 commits into
solana-labs:master
from
CriesofCarrots:fix-blockstore-empty-panic
Aug 6, 2020
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
Codecov Report
@@ Coverage Diff @@
## master #11423 +/- ##
=======================================
Coverage 81.9% 81.9%
=======================================
Files 320 320
Lines 75001 75008 +7
=======================================
+ Hits 61450 61459 +9
+ Misses 13551 13549 -2 |
3c1212d
to
86dac1d
Compare
86dac1d
to
350f065
Compare
t-nelson
previously approved these changes
Aug 6, 2020
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM! Thanks for bearing with me!
350f065
to
e33da61
Compare
automerge label removed due to a CI failure |
e33da61
to
f1ac52d
Compare
automerge label removed due to a CI failure |
f1ac52d
to
ffaeac0
Compare
mergify bot
pushed a commit
that referenced
this pull request
Aug 6, 2020
* Add panicking test * Add failing test: fresh transaction-status column shouldn't point at valid root 0 * Prevent transaction status match outside of primary-index bounds * Initialize transaction-status and address-signature primer entries with Slot::MAX * Revert "Add failing test: fresh transaction-status column shouldn't point at valid root 0" This reverts commit cbad2a9. * Revert "Initialize transaction-status and address-signature primer entries with Slot::MAX" This reverts commit ffaeac0. (cherry picked from commit 1061b50) # Conflicts: # ledger/src/blockstore.rs
mergify bot
pushed a commit
that referenced
this pull request
Aug 6, 2020
* Add panicking test * Add failing test: fresh transaction-status column shouldn't point at valid root 0 * Prevent transaction status match outside of primary-index bounds * Initialize transaction-status and address-signature primer entries with Slot::MAX * Revert "Add failing test: fresh transaction-status column shouldn't point at valid root 0" This reverts commit cbad2a9. * Revert "Initialize transaction-status and address-signature primer entries with Slot::MAX" This reverts commit ffaeac0. (cherry picked from commit 1061b50)
mergify bot
added a commit
that referenced
this pull request
Aug 6, 2020
* Add panicking test * Add failing test: fresh transaction-status column shouldn't point at valid root 0 * Prevent transaction status match outside of primary-index bounds * Initialize transaction-status and address-signature primer entries with Slot::MAX * Revert "Add failing test: fresh transaction-status column shouldn't point at valid root 0" This reverts commit cbad2a9. * Revert "Initialize transaction-status and address-signature primer entries with Slot::MAX" This reverts commit ffaeac0. (cherry picked from commit 1061b50) Co-authored-by: Tyera Eulberg <[email protected]>
mergify bot
added a commit
that referenced
this pull request
Aug 7, 2020
* Fix blockstore empty panic (#11423) * Add panicking test * Add failing test: fresh transaction-status column shouldn't point at valid root 0 * Prevent transaction status match outside of primary-index bounds * Initialize transaction-status and address-signature primer entries with Slot::MAX * Revert "Add failing test: fresh transaction-status column shouldn't point at valid root 0" This reverts commit cbad2a9. * Revert "Initialize transaction-status and address-signature primer entries with Slot::MAX" This reverts commit ffaeac0. (cherry picked from commit 1061b50) # Conflicts: # ledger/src/blockstore.rs * Fix conflict Co-authored-by: Tyera Eulberg <[email protected]> Co-authored-by: Tyera Eulberg <[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
Because of how the blockstore transaction_status_cf is initialized (to optimize compaction), an iterator on the column can match a default Signature. If slot 0 is a root, this can cause a panic.
Summary of Changes
Prevent match on index outside bounds
Also return an error instead of panicking, for redundancy
cc @jstarry