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

Add metrics for total txs bytes in mempool #237

Merged
merged 3 commits into from
Jul 2, 2024
Merged

Add metrics for total txs bytes in mempool #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bad6d36
Add metrics for total txs bytes in mempool
yzang2019 Jun 18, 2024
ef986ba
Merge branch 'main' into yzang/add-txs-bytes
yzang2019 Jun 18, 2024
8fbeecc
Merge branch 'main' into yzang/add-txs-bytes
yzang2019 Jul 2, 2024
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
39 changes: 28 additions & 11 deletions internal/mempool/mempool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,13 +180,27 @@ func (txmp *TxMempool) Unlock() {
// Size returns the number of valid transactions in the mempool. It is
// thread-safe.
func (txmp *TxMempool) Size() int {
return txmp.SizeWithoutPending() + txmp.PendingSize()
return txmp.NumTxsNotPending() + txmp.PendingSize()
}

func (txmp *TxMempool) SizeWithoutPending() int {
func (txmp *TxMempool) NumTxsNotPending() int {
return txmp.txStore.Size()
}

func (txmp *TxMempool) BytesNotPending() int64 {
txmp.txStore.mtx.RLock()
defer txmp.txStore.mtx.RUnlock()
totalBytes := int64(0)
for _, wrappedTx := range txmp.txStore.hashTxs {
totalBytes += int64(len(wrappedTx.tx))
}
return totalBytes
}

func (txmp *TxMempool) TotalTxsBytesSize() int64 {
return txmp.BytesNotPending() + int64(txmp.pendingTxs.sizeBytes)
}

// PendingSize returns the number of pending transactions in the mempool.
func (txmp *TxMempool) PendingSize() int {
return txmp.pendingTxs.Size()
Expand Down Expand Up @@ -427,7 +441,7 @@ func (txmp *TxMempool) ReapMaxBytesMaxGas(maxBytes, maxGas int64) types.Txs {
)

var txs []types.Tx
if uint64(txmp.SizeWithoutPending()) < txmp.config.TxNotifyThreshold {
if uint64(txmp.NumTxsNotPending()) < txmp.config.TxNotifyThreshold {
// do not reap anything if threshold is not met
return txs
}
Expand Down Expand Up @@ -549,7 +563,8 @@ func (txmp *TxMempool) Update(
}
}

txmp.metrics.Size.Set(float64(txmp.SizeWithoutPending()))
txmp.metrics.Size.Set(float64(txmp.NumTxsNotPending()))
txmp.metrics.TotalTxsSizeBytes.Set(float64(txmp.TotalTxsBytesSize()))
txmp.metrics.PendingSize.Set(float64(txmp.PendingSize()))
return nil
}
Expand Down Expand Up @@ -676,7 +691,7 @@ func (txmp *TxMempool) addNewTransaction(wtx *WrappedTx, res *abci.ResponseCheck
"priority", wtx.priority,
"tx", fmt.Sprintf("%X", wtx.tx.Hash()),
"height", txmp.height,
"num_txs", txmp.SizeWithoutPending(),
"num_txs", txmp.NumTxsNotPending(),
)
txmp.notifyTxsAvailable()
}
Expand Down Expand Up @@ -772,13 +787,14 @@ func (txmp *TxMempool) handleRecheckResult(tx types.Tx, res *abci.ResponseCheckT
if txmp.recheckCursor == nil {
txmp.logger.Debug("finished rechecking transactions")

if txmp.SizeWithoutPending() > 0 {
if txmp.NumTxsNotPending() > 0 {
txmp.notifyTxsAvailable()
}
}

txmp.metrics.Size.Set(float64(txmp.SizeWithoutPending()))
txmp.metrics.Size.Set(float64(txmp.NumTxsNotPending()))
txmp.metrics.PendingSize.Set(float64(txmp.PendingSize()))
txmp.metrics.TotalTxsSizeBytes.Set(float64(txmp.TotalTxsBytesSize()))
}

// updateReCheckTxs updates the recheck cursors using the gossipIndex. For
Expand Down Expand Up @@ -830,7 +846,7 @@ func (txmp *TxMempool) updateReCheckTxs(ctx context.Context) {
// the transaction can be inserted into the mempool.
func (txmp *TxMempool) canAddTx(wtx *WrappedTx) error {
var (
numTxs = txmp.SizeWithoutPending()
numTxs = txmp.NumTxsNotPending()
sizeBytes = txmp.SizeBytes()
)

Expand Down Expand Up @@ -869,9 +885,10 @@ func (txmp *TxMempool) insertTx(wtx *WrappedTx) bool {
if !inserted {
return false
}
txmp.metrics.TxSizeBytes.Observe(float64(wtx.Size()))
txmp.metrics.Size.Set(float64(txmp.SizeWithoutPending()))
txmp.metrics.TxSizeBytes.Add(float64(wtx.Size()))
txmp.metrics.Size.Set(float64(txmp.NumTxsNotPending()))
txmp.metrics.PendingSize.Set(float64(txmp.PendingSize()))
txmp.metrics.TotalTxsSizeBytes.Set(float64(txmp.TotalTxsBytesSize()))

if replacedTx != nil {
txmp.removeTx(replacedTx, true, false, false)
Expand Down Expand Up @@ -1013,7 +1030,7 @@ func (txmp *TxMempool) purgeExpiredTxs(blockHeight int64) {
}

func (txmp *TxMempool) notifyTxsAvailable() {
if txmp.SizeWithoutPending() == 0 {
if txmp.NumTxsNotPending() == 0 {
return
}

Expand Down
33 changes: 19 additions & 14 deletions internal/mempool/metrics.gen.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions internal/mempool/metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,11 @@ type Metrics struct {
// Number of pending transactions in mempool
PendingSize metrics.Gauge

// Histogram of transaction sizes in bytes.
TxSizeBytes metrics.Histogram `metrics_buckettype:"exp" metrics_bucketsizes:"1,3,7"`
// Accumulated transaction sizes in bytes.
TxSizeBytes metrics.Counter

// Total current mempool uncommitted txs bytes
TotalTxsSizeBytes metrics.Gauge

// Number of failed transactions.
FailedTxs metrics.Counter
Expand Down
Loading