feat: retry offline deal after commp errors #899
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
dirkmc
reviewed
Oct 18, 2022
dirkmc
reviewed
Oct 18, 2022
dirkmc
reviewed
Oct 18, 2022
dirkmc
reviewed
Oct 19, 2022
storagemarket/deal_commp.go
Outdated
| retry: types.DealRetryManual, | ||
| error: fmt.Errorf("commP mismatch, expected=%s, actual=%s", clientPieceCid, pieceCid), | ||
| } | ||
| } else { |
storagemarket/deal_commp.go
Outdated
| @@ -56,6 +65,13 @@ func (p *Provider) generatePieceCommitment(filepath string, pieceSize abi.Padded | |||
| var err error | |||
| pi, err = GenerateCommP(filepath) | |||
| if err != nil { | |||
| // Allow auto retry to cover cases where IO copy fails due to lack of space | |||
| if strings.Contains(err.Error(), "failed to write to CommP writer") { | |||
There was a problem hiding this comment.
Instead of doing string matching on the error string, let's use a custom error.
See for example ErrDealHandlerNotFound
Line 178 in 015b654
|
Could you please also add some cases to TestDealAutoRestartAfterAutoRecoverableErrors and TestDealRestartAfterManualRecoverableErrors (or create new tests if that's simpler) to verify that the changes you've made work correctly. The existing tests are in storagemarket/provider_test.go |
added 2 commits
October 19, 2022 17:42
dirkmc
force-pushed
the
feat/offline-deal-retry
branch
from
6d31c40
to
799c08c
Compare
dirkmc
force-pushed
the
feat/offline-deal-retry
branch
from
799c08c
to
69bb812
Compare
dirkmc
approved these changes
Nov 9, 2022
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.
fixes #895