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

miner: log last tx hash before commit interrupt (#1289)

Browse source
This commit is contained in:
Manav Darji 2024-07-11 14:08:07 +05:30 committed by GitHub
parent 1a05223076
commit 67159969e0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
miner/test_backend.go
View file

@ -540,6 +540,8 @@ func (w *worker) commitTransactionsWithDelay(env *environment, txs *transactions
}(chDeps) }(chDeps)
} }
var lastTxHash common.Hash
mainloop: mainloop:
for { for {
if interruptCtx != nil { if interruptCtx != nil {
@ -551,7 +553,7 @@ mainloop:
select { select {
case <-interruptCtx.Done(): case <-interruptCtx.Done():
txCommitInterruptCounter.Inc(1) txCommitInterruptCounter.Inc(1)
log.Warn("Tx Level Interrupt") log.Warn("Tx Level Interrupt", "hash", lastTxHash)
break mainloop break mainloop
default: default:
} }
@ -573,6 +575,7 @@ mainloop:
if ltx == nil { if ltx == nil {
break break
} }
lastTxHash = ltx.Hash
// If we don't have enough space for the next transaction, skip the account. // If we don't have enough space for the next transaction, skip the account.
if env.gasPool.Gas() < ltx.Gas { if env.gasPool.Gas() < ltx.Gas {
log.Trace("Not enough gas left for transaction", "hash", ltx.Hash, "left", env.gasPool.Gas(), "needed", ltx.Gas) log.Trace("Not enough gas left for transaction", "hash", ltx.Hash, "left", env.gasPool.Gas(), "needed", ltx.Gas)

5
miner/worker.go
View file

@ -956,6 +956,8 @@ func (w *worker) commitTransactions(env *environment, txs *transactionsByPriceAn
}(chDeps) }(chDeps)
} }
var lastTxHash common.Hash
mainloop: mainloop:
for { for {
// Check interruption signal and abort building if it's fired. // Check interruption signal and abort building if it's fired.
@ -974,7 +976,7 @@ mainloop:
select { select {
case <-interruptCtx.Done(): case <-interruptCtx.Done():
txCommitInterruptCounter.Inc(1) txCommitInterruptCounter.Inc(1)
log.Warn("Tx Level Interrupt") log.Warn("Tx Level Interrupt", "hash", lastTxHash)
break mainloop break mainloop
default: default:
} }
@ -990,6 +992,7 @@ mainloop:
if ltx == nil { if ltx == nil {
break break
} }
lastTxHash = ltx.Hash
// If we don't have enough space for the next transaction, skip the account. // If we don't have enough space for the next transaction, skip the account.
if env.gasPool.Gas() < ltx.Gas { if env.gasPool.Gas() < ltx.Gas {
log.Trace("Not enough gas left for transaction", "hash", ltx.Hash, "left", env.gasPool.Gas(), "needed", ltx.Gas) log.Trace("Not enough gas left for transaction", "hash", ltx.Hash, "left", env.gasPool.Gas(), "needed", ltx.Gas)