ignore resend SectorStartPacking event. and fix StartPacking's unsealedInfoMap lock #3374
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
magik6k
approved these changes
Aug 28, 2020
|
Thanks! |
arajasek
reviewed
Aug 30, 2020
| m.unsealedInfoMap.lk.Lock() | ||
| defer m.unsealedInfoMap.lk.Unlock() | ||
|
|
||
| // cannot send SectorStartPacking to sectors that have already been packed, otherwise it will cause the state machine to exit |
There was a problem hiding this comment.
This...shouldn't have been a problem, since the FSM's planOne should safely skip an unexpected SectorStartPacking event, since it's an Ignorable.
(Don't see anything wrong with adding this check, though)
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.
I once encountered StartPacking twice, causing the state machine to stop in error. And SectorAddPiece and SectorStartPacking are triggered simultaneously, causing the state machine to receive two events.This change should solve both of these problems.
planner for state Packing only has a plan for a single event only, got [{User:{NewPiece:{Piece:{Size:134217728 PieceCID:baga6ea4seaqc2k4bizwrswlo3l6wefxfu2ddktxnmzjv5vdpmx7qjhhgemagyfy} DealInfo:0xc0384a7740}}} {User:{FillerPieces:[{Size:268435456 PieceCID:baga6ea4seaqk2bufhfu5g7ju74eobh2wsmfevum2rhppmdf75z7b2m4byhtryny} {Size:536870912 PieceCID:baga6ea4seaqdsvqopmj2soyhujb72jza76t4wpq5fzifvm3ctz47iyytkewnubq} {Size:1073741824 PieceCID:baga6ea4seaqmzq6acl23axubdiv37xipnaz3qqtvwr57ekoaauviescphqnfwpi} {Size:2147483648 PieceCID:baga6ea4seaqh34u3nf3tdgpi6k2aw54rtucikcpo25uofrzjpmprinydj7b4mla} {Size:4294967296 PieceCID:baga6ea4seaqgntqfunthkuwpixacxtcoqojjdg66vq254l7vmjyyjdu7pntvcby} {Size:8589934592 PieceCID:baga6ea4seaqnqyicdbbfvnpjlmokmi45fgroiigxa2uw6nz6f6ojveoxlhizwai} {Size:17179869184 PieceCID:baga6ea4seaqg2nsld34emra2ljfgrbrdcswmbjdpaftrpzjuipudt3w7qpbikpa}]}}]:
github.com/filecoin-project/lotus/extern/storage-sealing.planOne.func1
/home/rc/filecoin-project-amd/lotus/extern/storage-sealing/fsm.go:390