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

Fix hande deal recover return value bug

Browse Source
This commit is contained in:
zenground0 2022-01-10 15:47:20 +05:30
parent 825e2c9527
commit d16c5d0e93
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -423,7 +423,7 @@ func (m *Sealing) handleRecoverDealIDsOrFailWith(ctx statemachine.Context, secto
// TODO: check if we are in an early enough state try to remove this piece // TODO: check if we are in an early enough state try to remove this piece
log.Errorf("can't fix sector deals: piece %d (of %d) of sector %d has nil DealInfo.PublishCid (refers to deal %d)", i, len(sector.Pieces), sector.SectorNumber, p.DealInfo.DealID) log.Errorf("can't fix sector deals: piece %d (of %d) of sector %d has nil DealInfo.PublishCid (refers to deal %d)", i, len(sector.Pieces), sector.SectorNumber, p.DealInfo.DealID)
// Not much to do here (and this can only happen for old spacerace sectors) // Not much to do here (and this can only happen for old spacerace sectors)
return ctx.Send(SectorRemove{}) return ctx.Send(failWith)
} }
var dp *market.DealProposal var dp *market.DealProposal
@ -458,7 +458,7 @@ func (m *Sealing) handleRecoverDealIDsOrFailWith(ctx statemachine.Context, secto
if len(failed)+paddingPieces == len(sector.Pieces) { if len(failed)+paddingPieces == len(sector.Pieces) {
log.Errorf("removing sector %d: all deals expired or unrecoverable: %+v", sector.SectorNumber, merr) log.Errorf("removing sector %d: all deals expired or unrecoverable: %+v", sector.SectorNumber, merr)
return ctx.Send(SectorRemove{}) return ctx.Send(failWith)
} }
// todo: try to remove bad pieces (hard; see the todo above) // todo: try to remove bad pieces (hard; see the todo above)
@ -466,7 +466,7 @@ func (m *Sealing) handleRecoverDealIDsOrFailWith(ctx statemachine.Context, secto
// for now removing sectors is probably better than having them stuck in RecoverDealIDs // for now removing sectors is probably better than having them stuck in RecoverDealIDs
// and expire anyways // and expire anyways
log.Errorf("removing sector %d: deals expired or unrecoverable: %+v", sector.SectorNumber, merr) log.Errorf("removing sector %d: deals expired or unrecoverable: %+v", sector.SectorNumber, merr)
return ctx.Send(SectorRemove{}) return ctx.Send(failWith)
} }
// 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