forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

core/rawdb: tiny log fixes to make it clearer what's happening

Browse source
This commit is contained in:
Péter Szilágyi 2019-11-13 10:52:32 +02:00
parent e3ec80ef29
commit 756d6afa9c
No known key found for this signature in database
GPG key ID: E9AE538CEDF8293D
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
core/rawdb/chain_iterator.go
View file

@ -100,7 +100,7 @@ func iterateCanonicalChain(db ethdb.Database, from uint64, to uint64, prepare pr
batch = db.NewBatch() batch = db.NewBatch()
start = time.Now() start = time.Now()
logged time.Time logged = start.Add(-7 * time.Second) // Unindex during import is fast, don't double log
) )
if !reverse { if !reverse {
next, first, last = int64(from), int64(from), int64(to) next, first, last = int64(from), int64(from), int64(to)
@ -144,12 +144,16 @@ func iterateCanonicalChain(db ethdb.Database, from uint64, to uint64, prepare pr
} }
// If we've spent too much time already, notify the user of what we're doing // If we've spent too much time already, notify the user of what we're doing
if time.Since(logged) > 8*time.Second { if time.Since(logged) > 8*time.Second {
log.Info(progMsg, "blocks", int64(math.Abs(float64(next-first))), "total", to-from, "number", block.Number(), "hash", block.Hash(), "elapsed", common.PrettyDuration(time.Since(start))) log.Info(progMsg, "blocks", int64(math.Abs(float64(next-first))), "total", to-from, "tail", block.Number(), "hash", block.Hash(), "elapsed", common.PrettyDuration(time.Since(start)))
logged = time.Now() logged = time.Now()
} }
} }
} }
log.Info(doneMsg, "blocks", to-from, "elapsed", common.PrettyDuration(time.Since(start))) tail := to
if reverse {
tail = from
}
log.Info(doneMsg, "blocks", to-from, "tail", tail, "elapsed", common.PrettyDuration(time.Since(start)))
return nil return nil
} }
@ -212,6 +216,7 @@ func UnindexTransactions(db ethdb.Database, from uint64, to uint64) {
// If only one block is unindexed, do it direclty // If only one block is unindexed, do it direclty
if from+1 == to { if from+1 == to {
DeleteTxLookupEntries(db, ReadBlock(db, ReadCanonicalHash(db, from), from)) DeleteTxLookupEntries(db, ReadBlock(db, ReadCanonicalHash(db, from), from))
log.Info("Unindexed transactions", "blocks", 1, "tail", to)
return return
} }
// Otherwise spin up the concurrent iterator and unindexer // Otherwise spin up the concurrent iterator and unindexer