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

Merge pull request #9830 from filecoin-project/asr/backport-panic-fix-1.18

Browse Source 
chore: backport: panic fix
This commit is contained in:
Jiaying Wang 2022-12-10 22:12:40 -05:00 committed by GitHub
commit 5c656133e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
storage/pipeline/input.go
View File

@ -443,6 +443,9 @@ func (m *Sealing) updateInput(ctx context.Context, sp abi.RegisteredSealProof) e
if err != nil { if err != nil {
return 0, big.Zero(), err return 0, big.Zero(), err
} }
if onChainInfo == nil {
return 0, big.Zero(), xerrors.Errorf("sector info for sector %d not found", sn)
}
memo[sn] = struct { memo[sn] = struct {
e abi.ChainEpoch e abi.ChainEpoch
p abi.TokenAmount p abi.TokenAmount
@ -488,10 +491,6 @@ func (m *Sealing) updateInput(ctx context.Context, sp abi.RegisteredSealProof) e
continue continue
} }
if !ok { if !ok {
exp, _, _ := getExpirationCached(sector.number)
// todo move this log into checkDealAssignable, make more detailed about the reason
log.Debugf("CC update sector %d cannot fit deal, expiration %d before deal end epoch %d", id, exp, piece.deal.DealProposal.EndEpoch)
continue continue
} }

26
storage/pipeline/sealing.go
View File

@ -142,8 +142,21 @@ type openSector struct {
} }
func (o *openSector) checkDealAssignable(piece *pendingPiece, expF expFn) (bool, error) { func (o *openSector) checkDealAssignable(piece *pendingPiece, expF expFn) (bool, error) {
log := log.With(
"sector", o.number,
"deal", piece.deal.DealID,
"dealEnd", piece.deal.DealProposal.EndEpoch,
"dealStart", piece.deal.DealProposal.StartEpoch,
"dealClaimEnd", piece.claimTerms.claimTermEnd,
"lastAssignedDealEnd", o.lastDealEnd,
"update", o.ccUpdate,
)
// if there are deals assigned, check that no assigned deal expires after termMax // if there are deals assigned, check that no assigned deal expires after termMax
if o.lastDealEnd > piece.claimTerms.claimTermEnd { if o.lastDealEnd > piece.claimTerms.claimTermEnd {
log.Debugw("deal not assignable to sector", "reason", "term end beyond last assigned deal end")
return false, nil return false, nil
} }
@ -153,15 +166,26 @@ func (o *openSector) checkDealAssignable(piece *pendingPiece, expF expFn) (bool,
} }
sectorExpiration, _, err := expF(o.number) sectorExpiration, _, err := expF(o.number)
if err != nil { if err != nil {
log.Debugw("deal not assignable to sector", "reason", "error getting sector expiranion", "error", err)
return false, err return false, err
} }
log = log.With(
"sectorExpiration", sectorExpiration,
)
// check that in case of upgrade sector, it's expiration isn't above deals claim TermMax // check that in case of upgrade sector, it's expiration isn't above deals claim TermMax
if sectorExpiration > piece.claimTerms.claimTermEnd { if sectorExpiration > piece.claimTerms.claimTermEnd {
log.Debugw("deal not assignable to sector", "reason", "term end beyond sector expiration")
return false, nil return false, nil
} }
return sectorExpiration >= piece.deal.DealProposal.EndEpoch, nil if sectorExpiration < piece.deal.DealProposal.EndEpoch {
log.Debugw("deal not assignable to sector", "reason", "sector expiration less than deal expiration")
return false, nil
}
return true, nil
} }
type pieceAcceptResp struct { type pieceAcceptResp struct {