From e7123d1a8efe30c985eb9daa6c5e2c813dcad045 Mon Sep 17 00:00:00 2001 From: Aayush Date: Fri, 21 Jan 2022 14:07:11 -0500 Subject: [PATCH] fix: sealer: correctly pipe through errors for SectorAbortUpgrade --- extern/storage-sealing/input.go | 2 +- extern/storage-sealing/states_failed.go | 2 +- extern/storage-sealing/states_replica_update.go | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/extern/storage-sealing/input.go b/extern/storage-sealing/input.go index 261979524..0afbaa369 100644 --- a/extern/storage-sealing/input.go +++ b/extern/storage-sealing/input.go @@ -528,7 +528,7 @@ func (m *Sealing) AbortUpgrade(sid abi.SectorNumber) error { m.startupWait.Wait() log.Infow("aborting upgrade of sector", "sector", sid, "trigger", "user") - return m.sectors.Send(uint64(sid), SectorAbortUpgrade{}) + return m.sectors.Send(uint64(sid), SectorAbortUpgrade{xerrors.New("triggered by user")}) } func proposalCID(deal api.PieceDealInfo) cid.Cid { diff --git a/extern/storage-sealing/states_failed.go b/extern/storage-sealing/states_failed.go index c32ac4c3a..244d3e721 100644 --- a/extern/storage-sealing/states_failed.go +++ b/extern/storage-sealing/states_failed.go @@ -478,7 +478,7 @@ func (m *Sealing) HandleRecoverDealIDs(ctx statemachine.Context, sector SectorIn } func (m *Sealing) handleSnapDealsRecoverDealIDs(ctx statemachine.Context, sector SectorInfo) error { - return m.handleRecoverDealIDsOrFailWith(ctx, sector, SectorAbortUpgrade{}) + return m.handleRecoverDealIDsOrFailWith(ctx, sector, SectorAbortUpgrade{xerrors.New("failed recovering deal ids")}) } func recoveryPiecesToFix(ctx context.Context, api SealingAPI, sector SectorInfo, maddr address.Address) ([]int, int, error) { diff --git a/extern/storage-sealing/states_replica_update.go b/extern/storage-sealing/states_replica_update.go index 00b4738ab..cd3e43230 100644 --- a/extern/storage-sealing/states_replica_update.go +++ b/extern/storage-sealing/states_replica_update.go @@ -192,8 +192,7 @@ func (m *Sealing) handleReplicaUpdateWait(ctx statemachine.Context, sector Secto } if !si.SealedCID.Equals(*sector.UpdateSealed) { - log.Errorf("mismatch of expected onchain sealed cid after replica update, expected %s got %s", sector.UpdateSealed, si.SealedCID) - return ctx.Send(SectorAbortUpgrade{}) + return ctx.Send(SectorAbortUpgrade{xerrors.Errorf("mismatch of expected onchain sealed cid after replica update, expected %s got %s", sector.UpdateSealed, si.SealedCID)}) } return ctx.Send(SectorReplicaUpdateLanded{}) }