Skip to content

Commit

Permalink
v1.17: Patch tokio to vendored version (backport of #34240) (#34435)
Browse files Browse the repository at this point in the history
* Patch tokio to vendored version (#34240)

* Patch tokio to vendored version

* Fix typo

(cherry picked from commit aaa48ec)

# Conflicts:
#	Cargo.toml

* Fix conflict

---------

Co-authored-by: Tyera <tyera@solana.com>
  • Loading branch information
mergify[bot] and CriesofCarrots committed Dec 13, 2023
1 parent 8b2c1a5 commit 928e384
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 4 deletions.
6 changes: 2 additions & 4 deletions Cargo.lock

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

19 changes: 19 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,7 @@ tempfile = "3.8.0"
test-case = "3.2.1"
thiserror = "1.0.49"
tiny-bip39 = "0.8.2"
# Update solana-tokio patch below when updating this version
tokio = "1.29.1"
tokio-serde = "0.8"
tokio-stream = "0.1.14"
Expand Down Expand Up @@ -445,3 +446,21 @@ crossbeam-epoch = { git = "https://github.com/solana-labs/crossbeam", rev = "fd2
# overrides in sync.
solana-program = { path = "sdk/program" }
solana-zk-token-sdk = { path = "zk-token-sdk" }
#
# 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/solana-labs/solana-tokio.git"
rev = "7cf47705faacf7bf0e43e4131a5377b3291fce21"

0 comments on commit 928e384

Please sign in to comment.