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

Move sector number calculation into newSector

Browse Source
This commit is contained in:
Aayush Rajasekaran 2020-06-23 19:19:16 -04:00
parent ff8894f2ec
commit 81a2792e37
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
sealing.go
View File

@ -103,14 +103,9 @@ func (m *Sealing) AddPieceToAnySector(ctx context.Context, size abi.UnpaddedPiec
return 0, 0, xerrors.Errorf("piece cannot fit into a sector") return 0, 0, xerrors.Errorf("piece cannot fit into a sector")
} }
sid, err := m.sc.Next() sid, err := m.newSector() // TODO: Put more than one thing in a sector
if err != nil { if err != nil {
return 0, 0, xerrors.Errorf("getting sector number: %w", err) return 0, 0, xerrors.Errorf("creating new sector: %w", err)
}
err = m.sealer.NewSector(context.TODO(), m.minerSector(sid)) // TODO: Put more than one thing in a sector
if err != nil {
return 0, 0, xerrors.Errorf("initializing sector: %w", err)
} }
ppi, err := m.sealer.AddPiece(sectorstorage.WithPriority(ctx, DealSectorPriority), m.minerSector(sid), []abi.UnpaddedPieceSize{}, size, r) ppi, err := m.sealer.AddPiece(sectorstorage.WithPriority(ctx, DealSectorPriority), m.minerSector(sid), []abi.UnpaddedPieceSize{}, size, r)
@ -118,11 +113,6 @@ func (m *Sealing) AddPieceToAnySector(ctx context.Context, size abi.UnpaddedPiec
return 0, 0, xerrors.Errorf("writing piece: %w", err) return 0, 0, xerrors.Errorf("writing piece: %w", err)
} }
err = m.newSector(sid)
if err != nil {
return 0, 0, xerrors.Errorf("creating new sector: %w", err)
}
err = m.addPiece(sid, Piece{ err = m.addPiece(sid, Piece{
Piece: ppi, Piece: ppi,
DealInfo: &d, DealInfo: &d,
@ -169,10 +159,20 @@ func (m *Sealing) StartPacking(sectorID abi.SectorNumber) error {
} }
// newSector creates a new sector for deal storage // newSector creates a new sector for deal storage
func (m *Sealing) newSector(sid abi.SectorNumber) error { func (m *Sealing) newSector() (abi.SectorNumber, error) {
sid, err := m.sc.Next()
if err != nil {
return 0, xerrors.Errorf("getting sector number: %w", err)
}
err = m.sealer.NewSector(context.TODO(), m.minerSector(sid))
if err != nil {
return 0, xerrors.Errorf("initializing sector: %w", err)
}
rt, err := ffiwrapper.SealProofTypeFromSectorSize(m.sealer.SectorSize()) rt, err := ffiwrapper.SealProofTypeFromSectorSize(m.sealer.SectorSize())
if err != nil { if err != nil {
return xerrors.Errorf("bad sector size: %w", err) return 0, xerrors.Errorf("bad sector size: %w", err)
} }
log.Infof("Creating sector %d", sid) log.Infof("Creating sector %d", sid)
@ -182,7 +182,7 @@ func (m *Sealing) newSector(sid abi.SectorNumber) error {
}) })
if err != nil { if err != nil {
return err return 0, xerrors.Errorf("starting the sector fsm: %w", err)
} }
m.unsealedInfos[sid] = UnsealedSectorInfo{ m.unsealedInfos[sid] = UnsealedSectorInfo{
@ -190,7 +190,7 @@ func (m *Sealing) newSector(sid abi.SectorNumber) error {
pieceSizes: nil, pieceSizes: nil,
} }
return nil return sid, nil
} }
// newSectorCC accepts a slice of pieces with no deal (junk data) // newSectorCC accepts a slice of pieces with no deal (junk data)