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

stmgr: Dedupe cron invocation

Browse Source
This commit is contained in:
Łukasz Magiera 2020-07-28 02:28:22 +02:00
parent 5b6006f8fe
commit 8889c5cfd3
1 changed files with 16 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
chain/stmgr/stmgr.go
View File

@ -152,12 +152,11 @@ func (sm *StateManager) ApplyBlocks(ctx context.Context, parentEpoch abi.ChainEp
return cid.Undef, cid.Undef, xerrors.Errorf("instantiating VM failed: %w", err) return cid.Undef, cid.Undef, xerrors.Errorf("instantiating VM failed: %w", err)
} }
// run cron for null rounds if any runCron := func() error {
for i := parentEpoch + 1; i < epoch; i++ {
// TODO: this nonce-getting is a tiny bit ugly // TODO: this nonce-getting is a tiny bit ugly
ca, err := vmi.StateTree().GetActor(builtin.SystemActorAddr) ca, err := vmi.StateTree().GetActor(builtin.SystemActorAddr)
if err != nil { if err != nil {
return cid.Undef, cid.Undef, err return err
} }
cronMsg := &types.Message{ cronMsg := &types.Message{
@ -172,15 +171,24 @@ func (sm *StateManager) ApplyBlocks(ctx context.Context, parentEpoch abi.ChainEp
} }
ret, err := vmi.ApplyImplicitMessage(ctx, cronMsg) ret, err := vmi.ApplyImplicitMessage(ctx, cronMsg)
if err != nil { if err != nil {
return cid.Undef, cid.Undef, err return err
} }
if cb != nil { if cb != nil {
if err := cb(cronMsg.Cid(), cronMsg, ret); err != nil { if err := cb(cronMsg.Cid(), cronMsg, ret); err != nil {
return cid.Undef, cid.Undef, xerrors.Errorf("callback failed on cron message: %w", err) return xerrors.Errorf("callback failed on cron message: %w", err)
} }
} }
if ret.ExitCode != 0 { if ret.ExitCode != 0 {
return cid.Undef, cid.Undef, xerrors.Errorf("CheckProofSubmissions exit was non-zero: %d", ret.ExitCode) return xerrors.Errorf("CheckProofSubmissions exit was non-zero: %d", ret.ExitCode)
}
return nil
}
// run cron for null rounds if any
for i := parentEpoch + 1; i < epoch; i++ {
if err := runCron(); err != nil {
return cid.Cid{}, cid.Cid{}, err
} }
vmi.SetBlockHeight(i + 1) vmi.SetBlockHeight(i + 1)
@ -253,38 +261,10 @@ func (sm *StateManager) ApplyBlocks(ctx context.Context, parentEpoch abi.ChainEp
if ret.ExitCode != 0 { if ret.ExitCode != 0 {
return cid.Undef, cid.Undef, xerrors.Errorf("reward application message failed (exit %d): %s", ret.ExitCode, ret.ActorErr) return cid.Undef, cid.Undef, xerrors.Errorf("reward application message failed (exit %d): %s", ret.ExitCode, ret.ActorErr)
} }
} }
{ if err := runCron(); err != nil {
// TODO: this nonce-getting is a tiny bit ugly return cid.Cid{}, cid.Cid{}, err
ca, err := vmi.StateTree().GetActor(builtin.SystemActorAddr)
if err != nil {
return cid.Undef, cid.Undef, err
}
cronMsg := &types.Message{
To: builtin.CronActorAddr,
From: builtin.SystemActorAddr,
Nonce: ca.Nonce,
Value: types.NewInt(0),
GasPrice: types.NewInt(0),
GasLimit: build.BlockGasLimit * 10, // Make super sure this is never too little
Method: builtin.MethodsCron.EpochTick,
Params: nil,
}
ret, err := vmi.ApplyImplicitMessage(ctx, cronMsg)
if err != nil {
return cid.Undef, cid.Undef, err
}
if cb != nil {
if err := cb(cronMsg.Cid(), cronMsg, ret); err != nil {
return cid.Undef, cid.Undef, xerrors.Errorf("callback failed on cron message: %w", err)
}
}
if ret.ExitCode != 0 {
return cid.Undef, cid.Undef, xerrors.Errorf("CheckProofSubmissions exit was non-zero: %d", ret.ExitCode)
}
} }
rectarr := adt.MakeEmptyArray(sm.cs.Store(ctx)) rectarr := adt.MakeEmptyArray(sm.cs.Store(ctx))