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

Merge pull request #61 from filecoin-project/fix/addpiece-math

Browse Source 
Fixes to math in AddPiece
This commit is contained in:
Łukasz Magiera 2020-07-30 14:39:17 +02:00 committed by GitHub
commit 12e79a1661
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sealing.go
View File

@ -79,7 +79,7 @@ type UnsealedSectorMap struct {
type UnsealedSectorInfo struct { type UnsealedSectorInfo struct {
numDeals uint64 numDeals uint64
// stored should always equal sum of pieceSizes.Padded() // stored should always equal sum of pieceSizes.Padded()
stored uint64 stored abi.PaddedPieceSize
pieceSizes []abi.UnpaddedPieceSize pieceSizes []abi.UnpaddedPieceSize
} }
@ -119,13 +119,13 @@ func (m *Sealing) Run(ctx context.Context) error {
func (m *Sealing) Stop(ctx context.Context) error { func (m *Sealing) Stop(ctx context.Context) error {
return m.sectors.Stop(ctx) return m.sectors.Stop(ctx)
} }
func (m *Sealing) AddPieceToAnySector(ctx context.Context, size abi.UnpaddedPieceSize, r io.Reader, d DealInfo) (abi.SectorNumber, uint64, error) { func (m *Sealing) AddPieceToAnySector(ctx context.Context, size abi.UnpaddedPieceSize, r io.Reader, d DealInfo) (abi.SectorNumber, abi.PaddedPieceSize, error) {
log.Infof("Adding piece for deal %d", d.DealID) log.Infof("Adding piece for deal %d", d.DealID)
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.PaddedPieceSize(m.sealer.SectorSize()).Unpadded() {
return 0, 0, xerrors.Errorf("piece cannot fit into a sector") return 0, 0, xerrors.Errorf("piece cannot fit into a sector")
} }
@ -155,7 +155,9 @@ func (m *Sealing) AddPieceToAnySector(ctx context.Context, size abi.UnpaddedPiec
m.unsealedInfoMap.mux.Unlock() m.unsealedInfoMap.mux.Unlock()
if m.unsealedInfoMap.infos[sid].numDeals == getDealPerSectorLimit(m.sealer.SectorSize()) { if m.unsealedInfoMap.infos[sid].numDeals == getDealPerSectorLimit(m.sealer.SectorSize()) {
m.StartPacking(sid) if err := m.StartPacking(sid); err != nil {
return 0, 0, xerrors.Errorf("start packing: %w", err)
}
} }
return sid, offset, nil return sid, offset, nil
@ -185,7 +187,7 @@ func (m *Sealing) addPiece(ctx context.Context, sectorID abi.SectorNumber, size
} }
m.unsealedInfoMap.infos[sectorID] = UnsealedSectorInfo{ m.unsealedInfoMap.infos[sectorID] = UnsealedSectorInfo{
numDeals: num, numDeals: num,
stored: ui.stored + uint64(piece.Piece.Size), stored: ui.stored + piece.Piece.Size,
pieceSizes: append(ui.pieceSizes, piece.Piece.Size.Unpadded()), pieceSizes: append(ui.pieceSizes, piece.Piece.Size.Unpadded()),
} }
@ -213,10 +215,10 @@ func (m *Sealing) StartPacking(sectorID abi.SectorNumber) error {
// Caller should hold m.unsealedInfoMap.mux // Caller should hold m.unsealedInfoMap.mux
func (m *Sealing) getSectorAndPadding(size abi.UnpaddedPieceSize) (abi.SectorNumber, []abi.PaddedPieceSize, error) { func (m *Sealing) getSectorAndPadding(size abi.UnpaddedPieceSize) (abi.SectorNumber, []abi.PaddedPieceSize, error) {
ss := m.sealer.SectorSize() ss := abi.PaddedPieceSize(m.sealer.SectorSize())
for k, v := range m.unsealedInfoMap.infos { for k, v := range m.unsealedInfoMap.infos {
pads, padLength := ffiwrapper.GetRequiredPadding(abi.PaddedPieceSize(v.stored), size.Padded()) pads, padLength := ffiwrapper.GetRequiredPadding(v.stored, size.Padded())
if v.stored+uint64(size)+uint64(padLength) <= uint64(ss) { if v.stored+size.Padded()+padLength <= ss {
return k, pads, nil return k, pads, nil
} }
} }