Skip to content

Commit

Permalink
Update to the latest tokio
Browse files Browse the repository at this point in the history
We were pinning to an ancient version of tokio because of allegged
issues with RPC and the io loop. We've merged
anza-xyz#3242 which should improve the io
loop situation with RPCs.

Update to tokio so we finally pick up
tokio-rs/tokio#6512 which fixes bad perf for
timeouts.
  • Loading branch information
alessandrod committed Jan 11, 2025
1 parent 737f89d commit c4d0eb5
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 46 deletions.
44 changes: 17 additions & 27 deletions Cargo.lock

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

20 changes: 1 addition & 19 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,7 @@ test-case = "3.3.1"
thiserror = "2.0.9"
tiny-bip39 = "0.8.2"
# Update solana-tokio patch below when updating this version
tokio = "1.29.1"
tokio = "1.43.0"
tokio-serde = "0.8"
tokio-stream = "0.1.17"
tokio-tungstenite = "0.20.1"
Expand Down Expand Up @@ -736,21 +736,3 @@ solana-zk-sdk = { path = "zk-sdk" }
# we override the opt-level to 3 for the crate.
[profile.dev.package.curve25519-dalek]
opt-level = 3

# Solana RPC nodes experience stalls when running with `tokio` containing this
# commit:
# https://github.com/tokio-rs/tokio/commit/4eed411519783ef6f58cbf74f886f91142b5cfa6
#
# Tokio maintainers believe performance degradation is due to application bugs:
# https://github.com/tokio-rs/tokio/issues/4873#issuecomment-1198277677
#
# This may indeed be true of the code in this monorepo, but we haven't yet
# identified the bug or a way to fix. As a stopgap, this patches `tokio` to the
# tagged version specified above with commit `4eed411` reverted.
#
# Comparison:
# https://github.com/tokio-rs/tokio/compare/tokio-1.29.1...solana-labs:solana-tokio:tokio-1.29.1-revert-4eed411
#
[patch.crates-io.tokio]
git = "https://github.com/anza-xyz/solana-tokio.git"
rev = "7cf47705faacf7bf0e43e4131a5377b3291fce21"

0 comments on commit c4d0eb5

Please sign in to comment.