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

fix(lotus-sim): log failed pre-commits and continue

Browse Source
This commit is contained in:
Steven Allen 2021-06-10 07:50:51 -07:00
parent 783dc5a33d
commit 8d734d81d9
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/lotus-sim/simulation/precommit.go
View File

@ -17,6 +17,7 @@ import (
tutils "github.com/filecoin-project/specs-actors/v5/support/testing" tutils "github.com/filecoin-project/specs-actors/v5/support/testing"
"github.com/filecoin-project/lotus/chain/actors" "github.com/filecoin-project/lotus/chain/actors"
"github.com/filecoin-project/lotus/chain/actors/aerrors"
"github.com/filecoin-project/lotus/chain/actors/builtin/miner" "github.com/filecoin-project/lotus/chain/actors/builtin/miner"
"github.com/filecoin-project/lotus/chain/actors/policy" "github.com/filecoin-project/lotus/chain/actors/policy"
"github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/chain/types"
@ -170,7 +171,7 @@ func (ss *simulationState) packPreCommitsMiner(ctx context.Context, cb packFunc,
} }
enc, err := actors.SerializeParams(&params) enc, err := actors.SerializeParams(&params)
if err != nil { if err != nil {
return 0, false, err return added, false, err
} }
// NOTE: just in-case, sendAndFund will "fund" and re-try for any message // NOTE: just in-case, sendAndFund will "fund" and re-try for any message
// that fails due to "insufficient funds". // that fails due to "insufficient funds".
@ -184,13 +185,22 @@ func (ss *simulationState) packPreCommitsMiner(ctx context.Context, cb packFunc,
// try again with a smaller batch. // try again with a smaller batch.
targetBatchSize /= 2 targetBatchSize /= 2
continue continue
} else if aerr, ok := err.(aerrors.ActorError); ok && !aerr.IsFatal() {
// Log the error and move on. No reason to stop.
log.Errorw("failed to pre-commit for unknown reasons",
"error", aerr,
"miner", minerAddr,
"sectors", batch,
"epoch", ss.nextEpoch(),
)
return added, false, nil
} else if err != nil { } else if err != nil {
return 0, false, err return added, false, err
} }
for _, info := range batch { for _, info := range batch {
if err := ss.commitQueue.enqueueProveCommit(minerAddr, epoch, info); err != nil { if err := ss.commitQueue.enqueueProveCommit(minerAddr, epoch, info); err != nil {
return 0, false, err return added, false, err
} }
added++ added++
} }
@ -215,7 +225,7 @@ func (ss *simulationState) packPreCommitsMiner(ctx context.Context, cb packFunc,
} }
if err := ss.commitQueue.enqueueProveCommit(minerAddr, epoch, info); err != nil { if err := ss.commitQueue.enqueueProveCommit(minerAddr, epoch, info); err != nil {
return 0, false, err return added, false, err
} }
added++ added++
} }