fix storage provider restart in publish stage #657
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
force-pushed
the
feat/stgprov-restart-publish
branch
2 times, most recently
from
9f4a7d4
to
abaa6b1
Compare
dirkmc
force-pushed
the
feat/stgprov-restart-publish
branch
from
abaa6b1
to
292d744
Compare
dirkmc
commented
Dec 20, 2021
Comment on lines
-617
to
-623
| // re-track all deals for whom we still have a local blockstore. | ||
| for _, d := range deals { | ||
| if _, err := os.Stat(d.InboundCAR); err == nil && d.Ref != nil { | ||
| _, _ = p.stores.GetOrOpen(d.ProposalCid.String(), d.InboundCAR, d.Ref.Root) | ||
| } | ||
| } | ||
|
|
There was a problem hiding this comment.
This piece of code was causing the problem - we shouldn't need to do this as stores.GetOrOpen() will be called lazily
dirkmc
commented
Dec 20, 2021
| @@ -107,36 +108,8 @@ func (p *providerDealEnvironment) GeneratePieceCommitment(proposalCid cid.Cid, c | |||
| } | |||
| }() | |||
|
|
|||
| // dump the CARv1 payload of the CARv2 file to the Commp Writer and get back the CommP. | |||
There was a problem hiding this comment.
Moved this code to its own file so it can be used from the test - no logical changes
dirkmc
commented
Dec 20, 2021
| } | ||
|
|
||
| // Generate commP | ||
| pieceCID, err := shared.GenerateCommp(pieceReader, uint64(pieceSize), uint64(pieceSize)) |
There was a problem hiding this comment.
I added commp generation to the test so if the data is bad the test will fail
dirkmc
added a commit
that referenced
this pull request
Dec 21, 2021
* feat: add SeekStart method to inflator reader, so we can seek back to the start when retrying AddPiece * fix: storage provider restart in publish stage (#657)
2 tasks
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.
Solution to filecoin-project/lotus#7815