From 414953c066a991d8eebca69914d89e5bba74d9b0 Mon Sep 17 00:00:00 2001 From: devopsbo3 <69951731+devopsbo3@users.noreply.github.com> Date: Fri, 10 Nov 2023 12:27:53 -0600 Subject: [PATCH] Revert "trie/triedb/pathdb: make shutdown journal log friendlier (#27905)" This reverts commit e7bebb92001c7a5d992284d6625b380022a730bf. --- trie/triedb/pathdb/journal.go | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/trie/triedb/pathdb/journal.go b/trie/triedb/pathdb/journal.go index ea90207f29..d8c7d39fb9 100644 --- a/trie/triedb/pathdb/journal.go +++ b/trie/triedb/pathdb/journal.go @@ -21,7 +21,6 @@ import ( "errors" "fmt" "io" - "time" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/rawdb" @@ -342,14 +341,6 @@ func (db *Database) Journal(root common.Hash) error { if l == nil { return fmt.Errorf("triedb layer [%#x] missing", root) } - disk := db.tree.bottom() - if l, ok := l.(*diffLayer); ok { - log.Info("Persisting dirty state to disk", "head", l.block, "root", root, "layers", l.id-disk.id+disk.buffer.layers) - } else { // disk layer only on noop runs (likely) or deep reorgs (unlikely) - log.Info("Persisting dirty state to disk", "root", root, "layers", disk.buffer.layers) - } - start := time.Now() - // Run the journaling db.lock.Lock() defer db.lock.Unlock() @@ -382,6 +373,6 @@ func (db *Database) Journal(root common.Hash) error { // Set the db in read only mode to reject all following mutations db.readOnly = true - log.Info("Persisted dirty state to disk", "size", common.StorageSize(journal.Len()), "elapsed", common.PrettyDuration(time.Since(start))) + log.Info("Stored journal in triedb", "disk", diskroot, "size", common.StorageSize(journal.Len())) return nil }