Skip to content
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

Jump to bottom

feat: added extra timing and tps info during block generation #265

Merged
merged 2 commits into from
Jun 4, 2021
Merged

feat: added extra timing and tps info during block generation #265

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b37f36
added extra timing info regarding block generation
iproudhon May 14, 2021
78d994c
reformat to keep lint happy
iproudhon Jun 4, 2021
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
44 changes: 37 additions & 7 deletions state/execution.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,20 @@ func (blockExec *BlockExecutor) ApplyBlock(

fail.Fail() // XXX

blockGenerationTimeMs := float64(time.Now().UnixNano()-execStartTime) / 1000000
numTxs := len(block.Txs)
tps := 0
if blockGenerationTimeMs > 0 {
tps = int(float64(numTxs) / blockGenerationTimeMs * 1000)
}
blockExec.logger.Info(
"block generated",
"height", block.Height,
"num_txs", numTxs,
"generation_time", blockGenerationTimeMs,
"tps", tps,
)

// Events are fired after everything else.
// NOTE: if we crash between Commit and Save, events wont be fired during replay
fireEvents(blockExec.logger, blockExec.eventBus, block, abciResponses, validatorUpdates)
Expand Down Expand Up @@ -270,12 +284,6 @@ func (blockExec *BlockExecutor) Commit(
}

// ResponseCommit has no error code - just data
blockExec.logger.Info(
"committed state",
"height", block.Height,
"num_txs", len(block.Txs),
"app_hash", fmt.Sprintf("%X", res.Data),
)

if stepTimes != nil {
stepTimes.ToCommitRechecking()
Expand All @@ -293,6 +301,15 @@ func (blockExec *BlockExecutor) Commit(
updateMempoolTimeMs := float64(updateMempoolEndTime-updateMempoolStartTime) / 1000000
blockExec.metrics.BlockUpdateMempoolTime.Set(updateMempoolTimeMs)

blockExec.logger.Info(
"committed state",
"height", block.Height,
"num_txs", len(block.Txs),
"app_hash", fmt.Sprintf("%X", res.Data),
"commit_time", appCommitTimeMs,
"update_mempool_time", updateMempoolTimeMs,
)

return res.Data, res.RetainHeight, err
}

Expand Down Expand Up @@ -335,6 +352,7 @@ func execBlockOnProxyApp(
}
proxyAppConn.SetGlobalCallback(proxyCb)

execBlockStartTime := time.Now().UnixNano()
commitInfo := getBeginBlockValidatorInfo(block, store, initialHeight)

byzVals := make([]abci.Evidence, 0)
Expand Down Expand Up @@ -375,7 +393,19 @@ func execBlockOnProxyApp(
return nil, err
}

logger.Info("executed block", "height", block.Height, "num_valid_txs", validTxs, "num_invalid_txs", invalidTxs)
execBlockEndTime := time.Now().UnixNano()
execBlockTimeMs := float64(execBlockEndTime-execBlockStartTime) / 1000000
tps := 0
if execBlockTimeMs > 0 {
tps = int(float64(validTxs+invalidTxs) / execBlockTimeMs * 1000)
}
logger.Info(
"executed block",
"height", block.Height,
"num_valid_txs", validTxs,
"num_invalid_txs", invalidTxs,
"execution_time", execBlockTimeMs,
"tps", tps)
return abciResponses, nil
}

Expand Down