Merge pull request #7245 from filecoin-project/fix/commagg-loop

sealing: Fix retry loop in SubmitCommitAggregate
filecoin-project · Sep 2, 2021 · 5831a6b · 5831a6b
2 parents 6a02237 + 41db98d
commit 5831a6b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/extern/storage-sealing/fsm.go b/extern/storage-sealing/fsm.go
@@ -113,7 +113,7 @@ var fsmPlanners = map[SectorState]func(events []statemachine.Event, state *Secto
 		on(SectorCommitFailed{}, CommitFailed),
 	),
 	SubmitCommitAggregate: planOne(
-		on(SectorCommitAggregateSent{}, CommitWait),
+		on(SectorCommitAggregateSent{}, CommitAggregateWait),
 		on(SectorCommitFailed{}, CommitFailed),
 		on(SectorRetrySubmitCommit{}, SubmitCommit),
 	),

diff --git a/extern/storage-sealing/fsm_test.go b/extern/storage-sealing/fsm_test.go
@@ -135,15 +135,15 @@ func TestHappyPathFinalizeEarly(t *testing.T) {
 	require.Equal(m.t, m.state.State, SubmitCommitAggregate)
 
 	m.planSingle(SectorCommitAggregateSent{})
-	require.Equal(m.t, m.state.State, CommitWait)
+	require.Equal(m.t, m.state.State, CommitAggregateWait)
 
 	m.planSingle(SectorProving{})
 	require.Equal(m.t, m.state.State, FinalizeSector)
 
 	m.planSingle(SectorFinalized{})
 	require.Equal(m.t, m.state.State, Proving)
 
-	expected := []SectorState{Packing, GetTicket, PreCommit1, PreCommit2, PreCommitting, PreCommitWait, WaitSeed, Committing, CommitFinalize, SubmitCommit, SubmitCommitAggregate, CommitWait, FinalizeSector, Proving}
+	expected := []SectorState{Packing, GetTicket, PreCommit1, PreCommit2, PreCommitting, PreCommitWait, WaitSeed, Committing, CommitFinalize, SubmitCommit, SubmitCommitAggregate, CommitAggregateWait, FinalizeSector, Proving}
 	for i, n := range notif {
 		if n.before.State != expected[i] {
 			t.Fatalf("expected before state: %s, got: %s", expected[i], n.before.State)

diff --git a/extern/storage-sealing/states_sealing.go b/extern/storage-sealing/states_sealing.go
@@ -710,11 +710,8 @@ func (m *Sealing) handleSubmitCommitAggregate(ctx statemachine.Context, sector S
 		Proof: sector.Proof, // todo: this correct??
 		Spt:   sector.SectorType,
 	})
-	if err != nil {
-		return ctx.Send(SectorRetrySubmitCommit{})
-	}
 
-	if res.Error != "" {
+	if err != nil || res.Error != "" {
 		tok, _, err := m.Api.ChainHead(ctx.Context())
 		if err != nil {
 			log.Errorf("handleSubmitCommit: api error, not proceeding: %+v", err)