Skip to content

Commit

Permalink
Merge branch 'tomas/tower-abci-shed' (#2152)
Browse files Browse the repository at this point in the history
* origin/tomas/tower-abci-shed:
  changelog: add #2152
  deps: switch to tower-abci fork with info requests load-shedding
  ledger: don't buffer or load shed mempool requests
  • Loading branch information
adrianbrink committed Nov 11, 2023
2 parents 6a99ddb + 5539fbb commit a4cf45e
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 9 deletions.
2 changes: 2 additions & 0 deletions .changelog/unreleased/bug-fixes/2152-pos-vp-no-catch.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Added handling of ABCI Info requests load-shedding and removed load-shedding
from Mempool requests. ([\#2152](https://github.com/anoma/namada/pull/2152))
3 changes: 1 addition & 2 deletions Cargo.lock

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

3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,8 @@ tonic = "0.8.3"
tonic-build = "0.8.4"
tower = "0.4"
# Also, using the same version of tendermint-rs as we do here.
tower-abci = "0.11.1"
# https://github.com/penumbra-zone/tower-abci/pull/40 based on 0.11.1
tower-abci = {git = "https://github.com/heliaxdev/tower-abci.git", rev = "a41ab4b336875084e04f4803868adf41ef62a67c"}
tracing = "0.1.30"
tracing-appender = "0.2.2"
tracing-log = "0.1.2"
Expand Down
7 changes: 1 addition & 6 deletions apps/src/lib/node/ledger/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -533,12 +533,7 @@ async fn run_abci(
let server = Server::builder()
.consensus(consensus)
.snapshot(snapshot)
.mempool(
ServiceBuilder::new()
.load_shed()
.buffer(5000) // matching default Comet's mempool.size
.service(mempool),
)
.mempool(mempool) // don't load_shed, it will make CometBFT crash
.info(
ServiceBuilder::new()
.load_shed()
Expand Down

0 comments on commit a4cf45e

Please sign in to comment.