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

mempool: ErrPreCheck and more log info #2724

Merged
merged 2 commits into from
Nov 6, 2018
Merged

mempool: ErrPreCheck and more log info #2724

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fbd5f1a
mempool: ErrPreCheck and more log info
ebuchman Oct 29, 2018
e3b7cf0
change Pre/PostCheckFunc to return errors
melekes Nov 1, 2018
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: 11 additions & 2 deletions mempool/mempool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ var (

// ErrMempoolIsFull means Tendermint & an application can't handle that much load
ErrMempoolIsFull = errors.New("Mempool is full")

// ErrPreCheck means the tx bytes are invalid - ie. too big.
ErrPreCheck = errors.New("Tx failed precheck")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we be explicit about the reason in the msg / logs? Otherwise devs will have to dig into the code in order to figure out what precheck is.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeh that would be nice - maybe those funcs should return errors instead of bool?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good idea

)

// PreCheckAminoMaxBytes checks that the size of the transaction plus the amino
Expand Down Expand Up @@ -286,7 +289,7 @@ func (mem *Mempool) CheckTx(tx types.Tx, cb func(*abci.Response)) (err error) {
}

if mem.preCheck != nil && !mem.preCheck(tx) {
return
return ErrPreCheck
}

// CACHE
Expand Down Expand Up @@ -346,7 +349,13 @@ func (mem *Mempool) resCbNormal(req *abci.Request, res *abci.Response) {
tx: tx,
}
mem.txs.PushBack(memTx)
mem.logger.Info("Added good transaction", "tx", TxID(tx), "res", r, "total", mem.Size())
mem.logger.Info("Added good transaction",
"tx", TxID(tx),
"res", r,
"height", memTx.height,
"total", mem.Size(),
"counter", memTx.counter,
)
mem.metrics.TxSizeBytes.Observe(float64(len(tx)))
mem.notifyTxsAvailable()
} else {
Expand Down