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.

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

v2.1: Update to the latest tokio (backport of #4411) #4446

Merged
merged 1 commit into from
Jan 15, 2025

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jan 14, 2025

We were pinning to an ancient version of tokio because of allegged issues with RPC and the io loop. We've merged #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.


This is an automatic backport of pull request #4411 done by Mergify.

@mergify mergify bot requested a review from a team as a code owner January 14, 2025 00:22
@mergify mergify bot added the conflicts label Jan 14, 2025
Copy link
Author

mergify bot commented Jan 14, 2025

Cherry-pick of de754be has failed:

On branch mergify/bp/v2.1/pr-4411
Your branch is up to date with 'origin/v2.1'.

You are currently cherry-picking commit de754be2e.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   Cargo.toml

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   Cargo.lock
	both modified:   programs/sbf/Cargo.lock
	deleted by us:   svm/examples/Cargo.lock

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

We were pinning to an ancient version of tokio because of allegged
issues with RPC and the io loop. We've merged
#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.

(cherry picked from commit de754be)
@t-nelson t-nelson force-pushed the mergify/bp/v2.1/pr-4411 branch from 9ca2c78 to 722947a Compare January 15, 2025 03:06
@t-nelson
Copy link

fixed it

Copy link

@alexpyattaev alexpyattaev left a comment

Choose a reason for hiding this comment

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

as already approved by Trent.

@alessandrod alessandrod merged commit 3ff01db into v2.1 Jan 15, 2025
28 checks passed
@alessandrod alessandrod deleted the mergify/bp/v2.1/pr-4411 branch January 15, 2025 10:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants