Merge pull request #8582 from filecoin-project/fix/snap-fin-first

fix: sealing: Finalize snap sectors before submitting proofs
filecoin-project · May 3, 2022 · e793d7e · e793d7e
2 parents 88f8c7d + 3ab625f
commit e793d7e
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/extern/storage-sealing/fsm.go b/extern/storage-sealing/fsm.go
@@ -166,25 +166,25 @@ var fsmPlanners = map[SectorState]func(events []statemachine.Event, state *Secto
 		on(SectorAbortUpgrade{}, AbortUpgrade),
 	),
 	ProveReplicaUpdate: planOne(
-		on(SectorProveReplicaUpdate{}, SubmitReplicaUpdate),
+		on(SectorProveReplicaUpdate{}, FinalizeReplicaUpdate),
 		on(SectorProveReplicaUpdateFailed{}, ReplicaUpdateFailed),
 		on(SectorDealsExpired{}, SnapDealsDealsExpired),
 		on(SectorInvalidDealIDs{}, SnapDealsRecoverDealIDs),
 		on(SectorAbortUpgrade{}, AbortUpgrade),
 	),
+	FinalizeReplicaUpdate: planOne(
+		on(SectorFinalized{}, SubmitReplicaUpdate),
+		on(SectorFinalizeFailed{}, FinalizeReplicaUpdateFailed),
+	),
 	SubmitReplicaUpdate: planOne(
 		on(SectorReplicaUpdateSubmitted{}, ReplicaUpdateWait),
 		on(SectorSubmitReplicaUpdateFailed{}, ReplicaUpdateFailed),
 	),
 	ReplicaUpdateWait: planOne(
-		on(SectorReplicaUpdateLanded{}, FinalizeReplicaUpdate),
+		on(SectorReplicaUpdateLanded{}, UpdateActivating),
 		on(SectorSubmitReplicaUpdateFailed{}, ReplicaUpdateFailed),
 		on(SectorAbortUpgrade{}, AbortUpgrade),
 	),
-	FinalizeReplicaUpdate: planOne(
-		on(SectorFinalized{}, UpdateActivating),
-		on(SectorFinalizeFailed{}, FinalizeReplicaUpdateFailed),
-	),
 	UpdateActivating: planOne(
 		on(SectorUpdateActive{}, ReleaseSectorKey),
 	),