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

Remove sectors with all deals expired in RecoverDealIDs

Browse Source
This commit is contained in:
Łukasz Magiera 2021-02-22 21:03:51 +01:00
parent 35759fa07e
commit 2b9ed9fa3d
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
extern/storage-sealing/states_failed.go vendored
View File

@ -3,6 +3,7 @@ package sealing
import ( import (
"time" "time"
"github.com/hashicorp/go-multierror"
"golang.org/x/xerrors" "golang.org/x/xerrors"
"github.com/filecoin-project/lotus/chain/actors/builtin/market" "github.com/filecoin-project/lotus/chain/actors/builtin/market"
@ -352,6 +353,7 @@ func (m *Sealing) handleRecoverDealIDs(ctx statemachine.Context, sector SectorIn
} }
var toFix []int var toFix []int
paddingPieces := 0
for i, p := range sector.Pieces { for i, p := range sector.Pieces {
// if no deal is associated with the piece, ensure that we added it as // if no deal is associated with the piece, ensure that we added it as
@ -361,6 +363,7 @@ func (m *Sealing) handleRecoverDealIDs(ctx statemachine.Context, sector SectorIn
if !p.Piece.PieceCID.Equals(exp) { if !p.Piece.PieceCID.Equals(exp) {
return xerrors.Errorf("sector %d piece %d had non-zero PieceCID %+v", sector.SectorNumber, i, p.Piece.PieceCID) return xerrors.Errorf("sector %d piece %d had non-zero PieceCID %+v", sector.SectorNumber, i, p.Piece.PieceCID)
} }
paddingPieces++
continue continue
} }
@ -396,6 +399,7 @@ func (m *Sealing) handleRecoverDealIDs(ctx statemachine.Context, sector SectorIn
} }
} }
failed := map[int]error{}
updates := map[int]abi.DealID{} updates := map[int]abi.DealID{}
for _, i := range toFix { for _, i := range toFix {
p := sector.Pieces[i] p := sector.Pieces[i]
@ -414,12 +418,27 @@ func (m *Sealing) handleRecoverDealIDs(ctx statemachine.Context, sector SectorIn
} }
res, err := m.dealInfo.GetCurrentDealInfo(ctx.Context(), tok, dp, *p.DealInfo.PublishCid) res, err := m.dealInfo.GetCurrentDealInfo(ctx.Context(), tok, dp, *p.DealInfo.PublishCid)
if err != nil { if err != nil {
return xerrors.Errorf("recovering deal ID for publish deal message %s (sector %d, piece %d): %w", *p.DealInfo.PublishCid, sector.SectorNumber, i, err) failed[i] = xerrors.Errorf("getting current deal info for piece %d: %w", i, err)
} }
updates[i] = res.DealID updates[i] = res.DealID
} }
if len(failed) > 0 {
var merr error
for _, e := range failed {
merr = multierror.Append(merr, e)
}
if len(failed)+paddingPieces == len(sector.Pieces) {
log.Errorf("removing sector %d: all deals expired or unrecoverable: %+v", sector.SectorNumber, merr)
return ctx.Send(SectorRemove{})
}
// todo: try to remove bad pieces (hard; see the todo above)
return xerrors.Errorf("failed to recover some deals: %w", merr)
}
// Not much to do here, we can't go back in time to commit this sector // Not much to do here, we can't go back in time to commit this sector
return ctx.Send(SectorUpdateDealIDs{Updates: updates}) return ctx.Send(SectorUpdateDealIDs{Updates: updates})
} }