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: add some log formatting polishes

Browse source
This commit is contained in:
Péter Szilágyi 2020-05-11 17:59:03 +03:00
parent be4346a8f9
commit d15d8ad44e
No known key found for this signature in database
GPG key ID: E9AE538CEDF8293D
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
core/rawdb/chain_iterator.go
View file

@ -202,7 +202,7 @@ func IndexTransactions(db ethdb.Database, from uint64, to uint64) {
lastNum = to lastNum = to
queue = prque.New(nil) queue = prque.New(nil)
// for stats reporting // for stats reporting
blockCount, txCount = 0, 0 blocks, txs = 0, 0
) )
defer close(abortCh) defer close(abortCh)
@ -220,8 +220,8 @@ func IndexTransactions(db ethdb.Database, from uint64, to uint64) {
delivery := queue.PopItem().(*blockTxHashes) delivery := queue.PopItem().(*blockTxHashes)
lastNum = delivery.number lastNum = delivery.number
WriteTxLookupEntriesByHash(batch, delivery.number, delivery.hashes) WriteTxLookupEntriesByHash(batch, delivery.number, delivery.hashes)
blockCount++ blocks++
txCount += len(delivery.hashes) txs += len(delivery.hashes)
// If enough data was accumulated in memory or we're at the last block, dump to disk // If enough data was accumulated in memory or we're at the last block, dump to disk
if batch.ValueSize() > ethdb.IdealBatchSize { if batch.ValueSize() > ethdb.IdealBatchSize {
// Also write the tail there // Also write the tail there
@ -234,7 +234,7 @@ func IndexTransactions(db ethdb.Database, from uint64, to uint64) {
} }
// 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("Indexing transactions", "blocks", blockCount, "txs", txCount, "current", lastNum, "total", to-from, "elapsed", common.PrettyDuration(time.Since(start))) log.Info("Indexing transactions", "blocks", blocks, "txs", txs, "tail", lastNum, "total", to-from, "elapsed", common.PrettyDuration(time.Since(start)))
logged = time.Now() logged = time.Now()
} }
} }
@ -247,7 +247,7 @@ func IndexTransactions(db ethdb.Database, from uint64, to uint64) {
return return
} }
} }
log.Info("Indexed transactions", "blocks", blockCount, "txs", txCount, "elapsed", common.PrettyDuration(time.Since(start))) log.Info("Indexed transactions", "blocks", blocks, "txs", txs, "tail", lastNum, "elapsed", common.PrettyDuration(time.Since(start)))
} }
// UnindexTransactions removes txlookup indices of the specified block range. // UnindexTransactions removes txlookup indices of the specified block range.
@ -275,14 +275,16 @@ func UnindexTransactions(db ethdb.Database, from uint64, to uint64) {
) )
defer close(abortCh) defer close(abortCh)
// Otherwise spin up the concurrent iterator and unindexer // Otherwise spin up the concurrent iterator and unindexer
count := 0 blocks, txs := 0, 0
for delivery := range hashesCh { for delivery := range hashesCh {
DeleteTxLookupEntriesByHash(batch, delivery.hashes) DeleteTxLookupEntriesByHash(batch, delivery.hashes)
txs += len(delivery.hashes)
blocks++
// If enough data was accumulated in memory or we're at the last block, dump to disk // If enough data was accumulated in memory or we're at the last block, dump to disk
// A batch counts the size of deletion as '1', so we need to flush more // A batch counts the size of deletion as '1', so we need to flush more
// often than that. // often than that.
count++ if blocks%1000 == 0 {
if count%1000 == 0 {
if err := batch.Write(); err != nil { if err := batch.Write(); err != nil {
log.Crit("Failed writing batch to db", "error", err) log.Crit("Failed writing batch to db", "error", err)
return return
@ -291,7 +293,7 @@ func UnindexTransactions(db ethdb.Database, from uint64, to uint64) {
} }
// 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("Unindexing transactions", "blocks", int64(math.Abs(float64(delivery.number-from))), "total", to-from, "elapsed", common.PrettyDuration(time.Since(start))) log.Info("Unindexing transactions", "blocks", "txs", txs, int64(math.Abs(float64(delivery.number-from))), "total", to-from, "elapsed", common.PrettyDuration(time.Since(start)))
logged = time.Now() logged = time.Now()
} }
} }
@ -299,5 +301,5 @@ func UnindexTransactions(db ethdb.Database, from uint64, to uint64) {
log.Crit("Failed writing batch to db", "error", err) log.Crit("Failed writing batch to db", "error", err)
return return
} }
log.Info("Indexed transactions", "blocks", int64(math.Abs(float64(to-from))), "total", to-from, "elapsed", common.PrettyDuration(time.Since(start))) log.Info("Unindexed transactions", "blocks", blocks, "txs", txs, "tail", to, "elapsed", common.PrettyDuration(time.Since(start)))
} }