cerc-io/lotus
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

Add new event for start of CC sectors

Browse Source
This commit is contained in:
Aayush Rajasekaran 2020-06-23 15:32:22 -04:00
parent 5ad33896cc
commit db863a4de7
4 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fsm.go
View File

@ -34,8 +34,11 @@ func (m *Sealing) Plan(events []statemachine.Event, user interface{}) (interface
var fsmPlanners = map[SectorState]func(events []statemachine.Event, state *SectorInfo) error{ var fsmPlanners = map[SectorState]func(events []statemachine.Event, state *SectorInfo) error{
// Sealing // Sealing
UndefinedSectorState: planOne(on(SectorStart{}, Packing)), UndefinedSectorState: planOne(
Packing: planOne(on(SectorPacked{}, PreCommit1)), on(SectorStart{}, Packing),
on(SectorStartCC{}, Packing),
),
Packing: planOne(on(SectorPacked{}, PreCommit1)),
PreCommit1: planOne( PreCommit1: planOne(
on(SectorPreCommit1{}, PreCommit2), on(SectorPreCommit1{}, PreCommit2),
on(SectorSealPreCommit1Failed{}, SealPreCommit1Failed), on(SectorSealPreCommit1Failed{}, SealPreCommit1Failed),

12
fsm_events.go
View File

@ -59,6 +59,18 @@ func (evt SectorStart) apply(state *SectorInfo) {
state.SectorType = evt.SectorType state.SectorType = evt.SectorType
} }
type SectorStartCC struct {
ID abi.SectorNumber
SectorType abi.RegisteredSealProof
Pieces []Piece
}
func (evt SectorStartCC) apply(state *SectorInfo) {
state.SectorNumber = evt.ID
state.Pieces = evt.Pieces
state.SectorType = evt.SectorType
}
type SectorPacked struct{ FillerPieces []abi.PieceInfo } type SectorPacked struct{ FillerPieces []abi.PieceInfo }
func (evt SectorPacked) apply(state *SectorInfo) { func (evt SectorPacked) apply(state *SectorInfo) {

2
garbage.go
View File

@ -77,7 +77,7 @@ func (m *Sealing) PledgeSector() error {
} }
} }
if err := m.newSector(sid, rt, ps); err != nil { if err := m.newSectorCC(sid, rt, ps); err != nil {
log.Errorf("%+v", err) log.Errorf("%+v", err)
return return
} }

22
sealing.go
View File

@ -90,7 +90,7 @@ func (m *Sealing) AllocatePiece(size abi.UnpaddedPieceSize) (sectorID abi.Sector
if (padreader.PaddedSize(uint64(size))) != size { if (padreader.PaddedSize(uint64(size))) != size {
return 0, 0, xerrors.Errorf("cannot allocate unpadded piece") return 0, 0, xerrors.Errorf("cannot allocate unpadded piece")
} }
if size > abi.UnpaddedPieceSize(m.sealer.SectorSize()) { if size > abi.UnpaddedPieceSize(m.sealer.SectorSize()) {
return 0, 0, xerrors.Errorf("piece cannot fit into a sector") return 0, 0, xerrors.Errorf("piece cannot fit into a sector")
} }
@ -130,11 +130,13 @@ func (m *Sealing) SealPiece(ctx context.Context, size abi.UnpaddedPieceSize, r i
}) })
} }
// newSector accepts a slice of pieces which will have a deal associated with func (m *Sealing) Remove(ctx context.Context, sid abi.SectorNumber) error {
// them (in the event of a storage deal) or no deal (in the event of sealing return m.sectors.Send(uint64(sid), SectorRemove{})
// garbage data) }
// newSector accepts a slice of pieces which will have deals associated with
func (m *Sealing) newSector(sid abi.SectorNumber, rt abi.RegisteredSealProof, pieces []Piece) error { func (m *Sealing) newSector(sid abi.SectorNumber, rt abi.RegisteredSealProof, pieces []Piece) error {
log.Infof("Start sealing %d", sid) log.Infof("Creating sector %d", sid)
return m.sectors.Send(uint64(sid), SectorStart{ return m.sectors.Send(uint64(sid), SectorStart{
ID: sid, ID: sid,
Pieces: pieces, Pieces: pieces,
@ -142,8 +144,14 @@ func (m *Sealing) newSector(sid abi.SectorNumber, rt abi.RegisteredSealProof, pi
}) })
} }
func (m *Sealing) Remove(ctx context.Context, sid abi.SectorNumber) error { // newSectorCC accepts a slice of pieces with no deal (junk data)
return m.sectors.Send(uint64(sid), SectorRemove{}) func (m *Sealing) newSectorCC(sid abi.SectorNumber, rt abi.RegisteredSealProof, pieces []Piece) error {
log.Infof("Creating CC sector %d", sid)
return m.sectors.Send(uint64(sid), SectorStartCC{
ID: sid,
Pieces: pieces,
SectorType: rt,
})
} }
func (m *Sealing) minerSector(num abi.SectorNumber) abi.SectorID { func (m *Sealing) minerSector(num abi.SectorNumber) abi.SectorID {