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

Add a lateStart indicator, differentiate on Error/Warn/Info

Browse Source
This commit is contained in:
Peter Rabbitson 2021-05-22 23:55:32 +02:00
parent 888c63b79c
commit 3a74ab8f82
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
miner/miner.go
View File

@ -13,6 +13,7 @@ import (
proof2 "github.com/filecoin-project/specs-actors/v2/actors/runtime/proof" proof2 "github.com/filecoin-project/specs-actors/v2/actors/runtime/proof"
"github.com/filecoin-project/lotus/chain/actors/builtin"
"github.com/filecoin-project/lotus/chain/actors/policy" "github.com/filecoin-project/lotus/chain/actors/policy"
"github.com/filecoin-project/lotus/chain/gen/slashfilter" "github.com/filecoin-project/lotus/chain/gen/slashfilter"
@ -438,13 +439,15 @@ func (m *Miner) mineOne(ctx context.Context, base *MiningBase) (minedBlock *type
} }
} }
log.Infow( isLate := uint64(start.Unix()) > (base.TipSet.MinTimestamp() + uint64(base.NullRounds*builtin.EpochDurationSeconds) + build.PropagationDelaySecs)
"completed mineOne",
"tookMilliseconds", (build.Clock.Now().UnixNano()-start.UnixNano())/1_000_000, logStruct := []interface{}{
"tookMilliseconds", (build.Clock.Now().UnixNano() - start.UnixNano()) / 1_000_000,
"forRound", int64(round), "forRound", int64(round),
"baseEpoch", int64(base.TipSet.Height()), "baseEpoch", int64(base.TipSet.Height()),
"baseDeltaSeconds", uint64(start.Unix())-base.TipSet.MinTimestamp(), "baseDeltaSeconds", uint64(start.Unix()) - base.TipSet.MinTimestamp(),
"nullRounds", int64(base.NullRounds), "nullRounds", int64(base.NullRounds),
"lateStart", isLate,
"beaconEpoch", uint64(rbase.Round), "beaconEpoch", uint64(rbase.Round),
"lookbackEpochs", int64(policy.ChainFinality), // hardcoded as it is unlikely to change again: https://github.com/filecoin-project/lotus/blob/v1.8.0/chain/actors/policy/policy.go#L180-L186 "lookbackEpochs", int64(policy.ChainFinality), // hardcoded as it is unlikely to change again: https://github.com/filecoin-project/lotus/blob/v1.8.0/chain/actors/policy/policy.go#L180-L186
"networkPowerAtLookback", mbi.NetworkPower.String(), "networkPowerAtLookback", mbi.NetworkPower.String(),
@ -452,7 +455,15 @@ func (m *Miner) mineOne(ctx context.Context, base *MiningBase) (minedBlock *type
"isEligible", mbi.EligibleForMining, "isEligible", mbi.EligibleForMining,
"isWinner", (winner != nil), "isWinner", (winner != nil),
"error", err, "error", err,
) }
if err != nil {
log.Errorw("completed mineOne", logStruct...)
} else if isLate {
log.Warnw("completed mineOne", logStruct...)
} else {
log.Infow("completed mineOne", logStruct...)
}
}() }()
mbi, err = m.api.MinerGetBaseInfo(ctx, m.address, round, base.TipSet.Key()) mbi, err = m.api.MinerGetBaseInfo(ctx, m.address, round, base.TipSet.Key())