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

Patch tokio to vendored version #34240

Merged
merged 2 commits into from
Dec 13, 2023

Conversation

CriesofCarrots
Copy link
Contributor

Problem

This issue still exists for RPC operators: #24644

Summary of Changes

Patch tokio to solana-tokio at v1.29.1 with 4eed411 manually reverted

Copy link

codecov bot commented Nov 28, 2023

Codecov Report

Merging #34240 (ba0c20a) into master (873bef9) will not change coverage.
Report is 101 commits behind head on master.
The diff coverage is n/a.

Additional details and impacted files
@@           Coverage Diff           @@
##           master   #34240   +/-   ##
=======================================
  Coverage    81.9%    81.9%           
=======================================
  Files         819      819           
  Lines      219387   219387           
=======================================
  Hits       179732   179732           
  Misses      39655    39655           

@steviez
Copy link
Contributor

steviez commented Nov 28, 2023

@CriesofCarrots - Moving some discussion from Discord to here, do you think we should "finish the revert" in light of you finding that piece of the commit that I missed? The revert seemed to help as-is, but I still feel like we should fix the mistake.

Assuming you agree with fixing that, I'm wondering if we should fix up the revert commit first, before moving to vendored tokio

@CriesofCarrots CriesofCarrots marked this pull request as ready for review December 6, 2023 17:16
@CriesofCarrots CriesofCarrots added the v1.17 PRs that should be backported to v1.17 label Dec 6, 2023
Copy link
Contributor

mergify bot commented Dec 6, 2023

Backports to the beta branch are to be avoided unless absolutely necessary for fixing bugs, security issues, and perf regressions. Changes intended for backport should be structured such that a minimum effective diff can be committed separately from any refactoring, plumbing, cleanup, etc that are not strictly necessary to achieve the goal. Any of the latter should go only into master and ride the normal stabilization schedule. Exceptions include CI/metrics changes, CLI improvements and documentation updates on a case by case basis.

Copy link
Contributor

@steviez steviez left a comment

Choose a reason for hiding this comment

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

Just the one nit on fixing typo in comment; otherwise, these looks good to me. Thanks for writing the detailed comment as well

Cargo.toml Outdated Show resolved Hide resolved
Copy link
Contributor

@steviez steviez left a comment

Choose a reason for hiding this comment

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

Looks good to me, but maybe wouldn't hurt to get t-nelson's blessing as well

Copy link
Contributor

@t-nelson t-nelson left a comment

Choose a reason for hiding this comment

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

good comment! :shipit:

@CriesofCarrots
Copy link
Contributor Author

I took some extra time to confirm that this would not break downstream users pulling in solana client crates, the way that pinning the tokio version did. All built as expected.

@CriesofCarrots CriesofCarrots merged commit aaa48ec into solana-labs:master Dec 13, 2023
45 checks passed
mergify bot pushed a commit that referenced this pull request Dec 13, 2023
* Patch tokio to vendored version

* Fix typo

(cherry picked from commit aaa48ec)

# Conflicts:
#	Cargo.toml
CriesofCarrots added a commit that referenced this pull request Dec 13, 2023
* 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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
v1.17 PRs that should be backported to v1.17
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants