From 2d46edace9b5bfe4f4e51bb991cdf3e17e4c7a60 Mon Sep 17 00:00:00 2001 From: Aayush Rajasekaran Date: Mon, 20 Jul 2020 12:43:19 -0400 Subject: [PATCH] enforce max deals per sector --- sealing.go | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/sealing.go b/sealing.go index 3750d0a49..e845fc91e 100644 --- a/sealing.go +++ b/sealing.go @@ -76,6 +76,7 @@ type UnsealedSectorMap struct { } type UnsealedSectorInfo struct { + numDeals uint64 // stored should always equal sum of pieceSizes.Padded() stored uint64 pieceSizes []abi.UnpaddedPieceSize @@ -128,16 +129,17 @@ func (m *Sealing) AddPieceToAnySector(ctx context.Context, size abi.UnpaddedPiec } m.unsealedInfoMap.mux.Lock() - defer m.unsealedInfoMap.mux.Unlock() sid, pads, err := m.getSectorAndPadding(size) if err != nil { + m.unsealedInfoMap.mux.Unlock() return 0, 0, xerrors.Errorf("getting available sector: %w", err) } for _, p := range pads { err = m.addPiece(ctx, sid, p.Unpadded(), m.pledgeReader(p.Unpadded()), nil) if err != nil { + m.unsealedInfoMap.mux.Unlock() return 0, 0, xerrors.Errorf("writing pads: %w", err) } } @@ -146,9 +148,15 @@ func (m *Sealing) AddPieceToAnySector(ctx context.Context, size abi.UnpaddedPiec err = m.addPiece(ctx, sid, size, r, &d) if err != nil { + m.unsealedInfoMap.mux.Unlock() return 0, 0, xerrors.Errorf("adding piece to sector: %w", err) } + m.unsealedInfoMap.mux.Unlock() + if m.unsealedInfoMap.infos[sid].numDeals == getDealPerSectorLimit(m.sealer.SectorSize()) { + m.StartPacking(sid) + } + return sid, offset, nil } @@ -170,7 +178,12 @@ func (m *Sealing) addPiece(ctx context.Context, sectorID abi.SectorNumber, size } ui := m.unsealedInfoMap.infos[sectorID] + num := m.unsealedInfoMap.infos[sectorID].numDeals + if di != nil { + num = num + 1 + } m.unsealedInfoMap.infos[sectorID] = UnsealedSectorInfo{ + numDeals: num, stored: ui.stored + uint64(piece.Piece.Size), pieceSizes: append(ui.pieceSizes, piece.Piece.Size.Unpadded()), } @@ -213,6 +226,7 @@ func (m *Sealing) getSectorAndPadding(size abi.UnpaddedPieceSize) (abi.SectorNum } m.unsealedInfoMap.infos[ns] = UnsealedSectorInfo{ + numDeals: 0, stored: 0, pieceSizes: nil, } @@ -293,3 +307,11 @@ func (m *Sealing) minerSector(num abi.SectorNumber) abi.SectorID { func (m *Sealing) Address() address.Address { return m.maddr } + +func getDealPerSectorLimit(size abi.SectorSize) uint64 { + if size < 64<<30 { + return 256 + } else { + return 512 + } +}