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

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

Browse Source 
sealing: Fix retry loop in SubmitCommitAggregate
This commit is contained in:
Łukasz Magiera 2021-09-02 11:31:34 +02:00 committed by GitHub
commit 5831a6ba4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extern/storage-sealing/fsm.go vendored
View File

@ -113,7 +113,7 @@ var fsmPlanners = map[SectorState]func(events []statemachine.Event, state *Secto
on(SectorCommitFailed{}, CommitFailed), on(SectorCommitFailed{}, CommitFailed),
), ),
SubmitCommitAggregate: planOne( SubmitCommitAggregate: planOne(
on(SectorCommitAggregateSent{}, CommitWait), on(SectorCommitAggregateSent{}, CommitAggregateWait),
on(SectorCommitFailed{}, CommitFailed), on(SectorCommitFailed{}, CommitFailed),
on(SectorRetrySubmitCommit{}, SubmitCommit), on(SectorRetrySubmitCommit{}, SubmitCommit),
), ),

4
extern/storage-sealing/fsm_test.go vendored
View File

@ -135,7 +135,7 @@ func TestHappyPathFinalizeEarly(t *testing.T) {
require.Equal(m.t, m.state.State, SubmitCommitAggregate) require.Equal(m.t, m.state.State, SubmitCommitAggregate)
m.planSingle(SectorCommitAggregateSent{}) m.planSingle(SectorCommitAggregateSent{})
require.Equal(m.t, m.state.State, CommitWait) require.Equal(m.t, m.state.State, CommitAggregateWait)
m.planSingle(SectorProving{}) m.planSingle(SectorProving{})
require.Equal(m.t, m.state.State, FinalizeSector) require.Equal(m.t, m.state.State, FinalizeSector)
@ -143,7 +143,7 @@ func TestHappyPathFinalizeEarly(t *testing.T) {
m.planSingle(SectorFinalized{}) m.planSingle(SectorFinalized{})
require.Equal(m.t, m.state.State, Proving) 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 { for i, n := range notif {
if n.before.State != expected[i] { if n.before.State != expected[i] {
t.Fatalf("expected before state: %s, got: %s", expected[i], n.before.State) t.Fatalf("expected before state: %s, got: %s", expected[i], n.before.State)

5
extern/storage-sealing/states_sealing.go vendored
View File

@ -710,11 +710,8 @@ func (m *Sealing) handleSubmitCommitAggregate(ctx statemachine.Context, sector S
Proof: sector.Proof, // todo: this correct?? Proof: sector.Proof, // todo: this correct??
Spt: sector.SectorType, 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()) tok, _, err := m.Api.ChainHead(ctx.Context())
if err != nil { if err != nil {
log.Errorf("handleSubmitCommit: api error, not proceeding: %+v", err) log.Errorf("handleSubmitCommit: api error, not proceeding: %+v", err)