Skip to content

[FIX] Trigger block execution metrics on reorg as well #835

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 7, 2020
Merged

[FIX] Trigger block execution metrics on reorg as well #835

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fce7360
[FIX] Trigger block execution metrics on reorg as well
Dec 4, 2020
e0c22cf
Merge branch 'develop' into fix/checkpointing-metrics
Dec 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 1 addition & 12 deletions src/main/scala/io/iohk/ethereum/ledger/BlockImport.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,7 @@ class BlockImport(
} yield {
validationResult.fold(
error => handleImportTopValidationError(error, block, importResult),
_ => {
measureBlockMetrics(importResult)
importResult
}
_ => importResult
)
}
}
Expand Down Expand Up @@ -81,14 +78,6 @@ class BlockImport(
}
}

private def measureBlockMetrics(importResult: BlockImportResult): Unit = {
importResult match {
case BlockImportedToTop(blockImportData) =>
blockImportData.foreach(blockData => BlockMetrics.measure(blockData.block, blockchain.getBlockByHash))
case _ => ()
}
}

private def handleImportTopValidationError(
error: ValidationBeforeExecError,
block: Block,
Expand Down
14 changes: 13 additions & 1 deletion src/main/scala/io/iohk/ethereum/ledger/Ledger.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,11 +130,13 @@ class LedgerImpl(
val hash = currentBestBlock.header.hash
blockchain.getChainWeightByHash(hash) match {
case Some(weight) =>
if (isPossibleNewBestBlock(block.header, currentBestBlock.header)) {
val importResult = if (isPossibleNewBestBlock(block.header, currentBestBlock.header)) {
blockImport.importToTop(block, currentBestBlock, weight)
} else {
blockImport.reorganise(block, currentBestBlock, weight)
}
importResult.foreach(measureBlockMetrics)
importResult

case None =>
Future.successful(BlockImportFailed(s"Couldn't get total difficulty for current best block with hash: $hash"))
Expand All @@ -154,6 +156,16 @@ class LedgerImpl(
override def resolveBranch(headers: NonEmptyList[BlockHeader]): BranchResolutionResult =
branchResolution.resolveBranch(headers)

private def measureBlockMetrics(importResult: BlockImportResult): Unit = {
importResult match {
case BlockImportedToTop(blockImportData) =>
blockImportData.foreach(blockData => BlockMetrics.measure(blockData.block, blockchain.getBlockByHash))
case ChainReorganised(_, newBranch, _) =>
newBranch.foreach(block => BlockMetrics.measure(block, blockchain.getBlockByHash))
case _ => ()
}
}

}

object Ledger {
Expand Down