fix: various traversal and verifier fixes #338
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
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## main #338 +/- ##
==========================================
+ Coverage 75.94% 76.37% +0.42%
==========================================
Files 85 85
Lines 6323 6378 +55
==========================================
+ Hits 4802 4871 +69
+ Misses 1248 1239 -9
+ Partials 273 268 -5
|
This was referenced Jun 29, 2023
pkg/verifiedcar/verifiedcar.go
Outdated
| } | ||
| } | ||
|
|
||
| func (nbro *NextBlockReadOpener) StorageReadOpener(lc linking.LinkContext, l datamodel.Link) (io.Reader, error) { |
There was a problem hiding this comment.
suggestion: make an internal function that just loads the block, wrap inside this function that just adds to count & sets the error if present. Will remove some repeated sets of the error and I think simplify
pkg/verifiedcar/verifiedcar.go
Outdated
| // make sure we don't have any extraneous data beyond what the traversal needs | ||
| _, err = cbr.Next() | ||
| if !errors.Is(err, io.EOF) { | ||
| if ctx.Err() == nil && !errors.Is(err, context.Canceled) && !errors.Is(err, io.EOF) { |
There was a problem hiding this comment.
don't we also need to return a seperate error for context cancelled? it's not a success no?
hannahhoward
approved these changes
Jun 30, 2023
6ab45e5 to
0958b2b
Compare
|
I've reworked that A few other tweaks. PTAL @hannahhoward |
hannahhoward
approved these changes
Jul 4, 2023
Closes: #336 * don't treat context cancellation as an ErrExtraneousBlock in the CAR verifier * capture and properly handle block load errors that are missed by the go-ipld-prime traverser, ref: ipld/go-ipld-prime#524 * fix flaky case(s) in verifiedcar test suite where multi-level sharded directory is assumed but only a single block dir is produced
0958b2b to
59c5880
Compare
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.
Closes: #336
The flaky one is really interesting, it became more flaky once we started properly and consistently reporting errors from the traversal, then it would flip between two error types. The fix was to ensure that the fixture data had a particular shape because certain forms produce certain errors. Fun fun.