mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-25 06:06:44 +00:00
log
This commit is contained in:
parent
02474bd0bc
commit
c26dde39db
2 changed files with 5 additions and 7 deletions
|
|
@ -1735,7 +1735,7 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if ctx.Bool(MetricsEnabledFlag.Name) && ctx.Bool(MetricsStateSizeFlag.Name) {
|
if ctx.Bool(MetricsEnabledFlag.Name) && ctx.Bool(MetricsStateSizeFlag.Name) {
|
||||||
log.Error("Enabling state size metrics")
|
log.Info("Enabling state size metrics")
|
||||||
cfg.EnableStateSizeTracking = true
|
cfg.EnableStateSizeTracking = true
|
||||||
}
|
}
|
||||||
// Override any default configs for hard coded networks.
|
// Override any default configs for hard coded networks.
|
||||||
|
|
|
||||||
|
|
@ -82,8 +82,7 @@ type SizeStats struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s SizeStats) String() string {
|
func (s SizeStats) String() string {
|
||||||
return fmt.Sprintf("Block: %d Root: %s, Accounts: %d (%s), Storages: %d (%s), AccountTrienodes: %d (%s), StorageTrienodes: %d (%s), ContractCodes: %d (%s)",
|
return fmt.Sprintf("Accounts: %d (%s), Storages: %d (%s), AccountTrienodes: %d (%s), StorageTrienodes: %d (%s), ContractCodes: %d (%s)",
|
||||||
s.BlockNumber, s.StateRoot.Hex(),
|
|
||||||
s.Accounts, common.StorageSize(s.AccountBytes),
|
s.Accounts, common.StorageSize(s.AccountBytes),
|
||||||
s.Storages, common.StorageSize(s.StorageBytes),
|
s.Storages, common.StorageSize(s.StorageBytes),
|
||||||
s.AccountTrienodes, common.StorageSize(s.AccountTrienodeBytes),
|
s.AccountTrienodes, common.StorageSize(s.AccountTrienodeBytes),
|
||||||
|
|
@ -383,7 +382,7 @@ wait:
|
||||||
}
|
}
|
||||||
done = make(chan buildResult)
|
done = make(chan buildResult)
|
||||||
go t.build(entry.root, entry.blockNumber, done)
|
go t.build(entry.root, entry.blockNumber, done)
|
||||||
log.Info("Measuring persistent state size", "root", root.Hex())
|
log.Info("Measuring persistent state size", "root", root.Hex(), "number", entry.blockNumber)
|
||||||
|
|
||||||
case result := <-done:
|
case result := <-done:
|
||||||
t.triedb.SetForceFlush(false)
|
t.triedb.SetForceFlush(false)
|
||||||
|
|
@ -415,8 +414,7 @@ wait:
|
||||||
if err := apply(result.root, result.stat); err != nil {
|
if err := apply(result.root, result.stat); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
log.Info("Init state size", "stat", result.stat)
|
log.Info("Measured persistent state size", "root", result.root, "number", result.blockNumber, "stat", result.stat, "elapsed", common.PrettyDuration(result.elapsed))
|
||||||
log.Info("Measured persistent state size", "root", result.root, "number", result.blockNumber, "elapsed", common.PrettyDuration(result.elapsed))
|
|
||||||
return stats, nil
|
return stats, nil
|
||||||
|
|
||||||
case <-t.abort:
|
case <-t.abort:
|
||||||
|
|
@ -563,7 +561,7 @@ func (t *SizeTracker) iterateTable(closed chan struct{}, prefix []byte, name str
|
||||||
}
|
}
|
||||||
|
|
||||||
func (t *SizeTracker) upload(stats SizeStats) {
|
func (t *SizeTracker) upload(stats SizeStats) {
|
||||||
log.Info("Update state size", "stat", stats)
|
log.Debug("Uploading state size", "number", stats.BlockNumber, "root", stats.StateRoot, "stat", stats)
|
||||||
blockInfoGauge.Update(metrics.GaugeInfoValue{
|
blockInfoGauge.Update(metrics.GaugeInfoValue{
|
||||||
"number": hexutil.Uint64(stats.BlockNumber).String(),
|
"number": hexutil.Uint64(stats.BlockNumber).String(),
|
||||||
"hash": stats.StateRoot.Hex(),
|
"hash": stats.StateRoot.Hex(),
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue