Better dupe detection #13992
Merged
Better dupe detection #13992
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
sakridge
force-pushed
the
shred-dupe
branch
4 times, most recently
from
754f356 to
ffc90c7
Compare
lombokcryptoid
approved these changes
Dec 8, 2020
lombokcryptoid
approved these changes
Dec 8, 2020
lombokcryptoid
approved these changes
Dec 8, 2020
Codecov Report
@@ Coverage Diff @@
## master #13992 +/- ##
========================================
Coverage 82.1% 82.1%
========================================
Files 381 381
Lines 93793 93930 +137
========================================
+ Hits 77020 77187 +167
+ Misses 16773 16743 -30 |
lombokcryptoid
approved these changes
Dec 8, 2020
carllin
reviewed
Dec 8, 2020
carllin
reviewed
Dec 8, 2020
carllin
reviewed
Dec 8, 2020
carllin
reviewed
Dec 8, 2020
ledger/src/blockstore.rs
Outdated
| let mut conflicting_shred = None; | ||
| for coding_index in coding_start..coding_end { | ||
| if let Ok(Some(shred)) = self.get_coding_shred(slot, coding_index) { | ||
| conflicting_shred = Some(shred); |
There was a problem hiding this comment.
Before we store the duplicate proof, should we add a sanity check here that this conflicting_shred has
- a different
num_data_shreds()ornum_coding_shredsthan the newly receivedshred - The same fec_set_index
carllin
reviewed
Dec 8, 2020
ledger/src/blockstore.rs
Outdated
| @@ -1051,6 +1051,26 @@ impl Blockstore { | |||
| }); | |||
|
|
|||
| if erasure_config != erasure_meta.config { | |||
| let coding_start = erasure_meta.first_coding_index; | |||
There was a problem hiding this comment.
I just realized that the erasure_config != erasure_meta.config check doesn't account for first_coding_index in ErasureMeta, maybe this: https://github.com/solana-labs/solana/pull/13992/files#diff-01b72272fd1033dcbb8fed13821a6232d35913119af6be20a7c2d1e9c772feb9R1037 should be an ErasureMeta so we can do a full equality check
carllin
reviewed
Dec 8, 2020
sakridge
force-pushed
the
shred-dupe
branch
7 times, most recently
from
cb62622 to
b7c974a
Compare
mergify bot
pushed a commit
that referenced
this pull request
Dec 10, 2020
(cherry picked from commit c5fe076)
mergify bot
added a commit
that referenced
this pull request
Dec 10, 2020
(cherry picked from commit c5fe076) Co-authored-by: sakridge <[email protected]>
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
Duplicate shred cases ignored.
Summary of Changes
Set in duplicate column and ignore on voting.
Fixes #