Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

Commit 928e384

Browse files
mergify[bot]Tyera
and
Tyera
authored
v1.17: Patch tokio to vendored version (backport of #34240) (#34435)
* 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 <[email protected]>
1 parent 8b2c1a5 commit 928e384

File tree

2 files changed

+21
-4
lines changed

2 files changed

+21
-4
lines changed

Cargo.lock

+2-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+19
Original file line numberDiff line numberDiff line change
@@ -396,6 +396,7 @@ tempfile = "3.8.0"
396396
test-case = "3.2.1"
397397
thiserror = "1.0.49"
398398
tiny-bip39 = "0.8.2"
399+
# Update solana-tokio patch below when updating this version
399400
tokio = "1.29.1"
400401
tokio-serde = "0.8"
401402
tokio-stream = "0.1.14"
@@ -445,3 +446,21 @@ crossbeam-epoch = { git = "https://github.com/solana-labs/crossbeam", rev = "fd2
445446
# overrides in sync.
446447
solana-program = { path = "sdk/program" }
447448
solana-zk-token-sdk = { path = "zk-token-sdk" }
449+
#
450+
# Solana RPC nodes experience stalls when running with `tokio` containing this
451+
# commit:
452+
# https://github.com/tokio-rs/tokio/commit/4eed411519783ef6f58cbf74f886f91142b5cfa6
453+
#
454+
# Tokio maintainers believe performance degradation is due to application bugs:
455+
# https://github.com/tokio-rs/tokio/issues/4873#issuecomment-1198277677
456+
#
457+
# This may indeed be true of the code in this monorepo, but we haven't yet
458+
# identified the bug or a way to fix. As a stopgap, this patches `tokio` to the
459+
# tagged version specified above with commit `4eed411` reverted.
460+
#
461+
# Comparison:
462+
# https://github.com/tokio-rs/tokio/compare/tokio-1.29.1...solana-labs:solana-tokio:tokio-1.29.1-revert-4eed411
463+
#
464+
[patch.crates-io.tokio]
465+
git = "https://github.com/solana-labs/solana-tokio.git"
466+
rev = "7cf47705faacf7bf0e43e4131a5377b3291fce21"

0 commit comments

Comments
 (0)