forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-27 15:16:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

feat(scroll-worker): add nil consumption block metrics (#1033)

Browse source 
* feat(scroll-worker): add nil consumption block metrics

* increase the version
This commit is contained in:
colin 2024-09-17 22:03:15 +08:00 committed by GitHub
parent 521a074f60
commit 1d02d04b5d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
miner/scroll_worker.go
View file

@ -70,6 +70,9 @@ var (
commitReasonCCCCounter = metrics.NewRegisteredCounter("miner/commit_reason_ccc", nil)
commitReasonDeadlineCounter = metrics.NewRegisteredCounter("miner/commit_reason_deadline", nil)
commitGasCounter = metrics.NewRegisteredCounter("miner/commit_gas", nil)
missingRCOnRestartCounter = metrics.NewRegisteredCounter("miner/missing_rc_on_restart", nil)
missingAncestorRCCounter = metrics.NewRegisteredCounter("miner/missing_ancestor_rc", nil)
)
// prioritizedTransaction represents a single transaction that
@ -306,6 +309,8 @@ func (w *worker) checkHeadRowConsumption() error {
block := w.chain.GetBlockByNumber(curBlockNum)
// only spawn CCC checkers for blocks with no row consumption data stored in DB
if rawdb.ReadBlockRowConsumption(w.chain.Database(), block.Hash()) == nil {
missingRCOnRestartCounter.Inc(1)
if err := w.asyncChecker.Check(block); err != nil {
return err
}
@ -870,6 +875,8 @@ func (w *worker) commit(reorging bool) (common.Hash, error) {
ancestorHeight := currentHeight - maxReorgDepth
ancestorHash := w.chain.GetHeaderByNumber(ancestorHeight).Hash()
if rawdb.ReadBlockRowConsumption(w.chain.Database(), ancestorHash) == nil {
missingAncestorRCCounter.Inc(1)
// reject committing to a block if its ancestor doesn't have its RC stored in DB yet.
// which may either mean that it failed CCC or it is still in the process of being checked
return common.Hash{}, retryableCommitError{inner: errors.New("ancestor doesn't have RC yet")}

2
params/version.go
View file

@ -24,7 +24,7 @@ import (
const (
VersionMajor = 5 // Major version component of the current release
VersionMinor = 7 // Minor version component of the current release
VersionPatch = 15 // Patch version component of the current release
VersionPatch = 16 // Patch version component of the current release
VersionMeta = "mainnet" // Version metadata to append to the version string
)