storagefsm: Check per-sector deal limits

extern/storage-sealing/input.go

@@ -35,6 +35,15 @@ func (m *Sealing) handleWaitDeals(ctx statemachine.Context, sector SectorInfo) e
 		}
 	}
 
+	maxDeals, err := getDealPerSectorLimit(sector.SectorType)
+	if err != nil {
+		return xerrors.Errorf("getting per-sector deal limit: %w", err)
+	}
+
+	if len(sector.dealIDs()) >= maxDeals {
+		return ctx.Send(SectorStartPacking{})
+	}
+
 	if sector.CreationTime != 0 {
 		cfg, err := m.getConfig()
 		if err != nil {
@@ -100,7 +109,12 @@ func (m *Sealing) handleAddPiece(ctx statemachine.Context, sector SectorInfo) er
 		offset += p.Piece.Size.Unpadded()
 	}
 
-	for _, piece := range sector.PendingPieces {
+	maxDeals, err := getDealPerSectorLimit(sector.SectorType)
+	if err != nil {
+		return xerrors.Errorf("getting per-sector deal limit: %w", err)
+	}
+
+	for i, piece := range sector.PendingPieces {
 		m.inputLk.Lock()
 		deal, ok := m.pendingPieces[piece]
 		m.inputLk.Unlock()
@@ -110,6 +124,12 @@ func (m *Sealing) handleAddPiece(ctx statemachine.Context, sector SectorInfo) er
 			return xerrors.Errorf("piece %s assigned to sector %d not found", piece, sector.SectorNumber)
 		}
 
+		if len(sector.dealIDs())+(i+1) > maxDeals {
+			// shouldn't happen, but just in case
+			deal.accepted(sector.SectorNumber, offset, xerrors.Errorf("too many deals assigned to sector %d, dropping deal", sector.SectorNumber))
+			continue
+		}
+
 		pads, padLength := ffiwrapper.GetRequiredPadding(offset.Padded(), deal.size.Padded())
 
 		if offset.Padded()+padLength+deal.size.Padded() > abi.PaddedPieceSize(ssize) {

extern/storage-sealing/sealing.go

@@ -241,9 +241,14 @@ func (m *Sealing) Address() address.Address {
 	return m.maddr
 }
 
-func getDealPerSectorLimit(size abi.SectorSize) uint64 {
-	if size < 64<<30 {
-		return 256
+func getDealPerSectorLimit(spt abi.RegisteredSealProof) (int, error) {
+	size, err := spt.SectorSize()
+	if err != nil {
+		return 0, err
 	}
-	return 512
+
+	if size < 64<<30 {
+		return 256, nil
+	}
+	return 512, nil
 }

extern/storage-sealing/types.go

@@ -3,6 +3,7 @@ package sealing
 import (
 	"bytes"
 	"context"
+
 	"github.com/ipfs/go-cid"
 
 	"github.com/filecoin-project/go-state-types/abi"