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

v1.18: Disable cache warmer if RPC is not using it (backport of #1063) #1068

Merged
merged 2 commits into from
Apr 26, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Apr 26, 2024

Problem

Disable cache warmer if RPC is not using it

Summary of Changes

Fixes #


This is an automatic backport of pull request #1063 done by [Mergify](https://mergify.com).

* simplify warm_quic_cache_service instantiation

(cherry picked from commit d87e23d)

# Conflicts:
#	core/src/tvu.rs
@mergify mergify bot added the conflicts label Apr 26, 2024
@mergify mergify bot requested a review from a team as a code owner April 26, 2024 02:16
Copy link
Author

mergify bot commented Apr 26, 2024

Cherry-pick of d87e23d has failed:

On branch mergify/bp/v1.18/pr-1063
Your branch is up to date with 'origin/v1.18'.

You are currently cherry-picking commit d87e23d8d9.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   core/src/tvu.rs

no changes added to commit (use "git add" and/or "git commit -a")

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

@mergify mergify bot requested a review from a team as a code owner April 26, 2024 02:16
@lijunwangs lijunwangs changed the title v1.18: simplify warm_quic_cache_service instantiation (backport of #1063) v1.18: Disable cache warmer if RPC is not using it (backport of #1063) Apr 26, 2024
@@ -1306,7 +1306,7 @@ impl Validator {
config.wait_to_vote_slot,
accounts_background_request_sender,
config.runtime_config.log_messages_bytes_limit,
&connection_cache,
json_rpc_service.is_some().then_some(&connection_cache), // for the cache warmer only used for STS for RPC service

Choose a reason for hiding this comment

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

It looks like we can avoid creating connection_cache entirely if json_rpc_service.is_none()?

Choose a reason for hiding this comment

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

we can't, the forwarder still uses the cache

@codecov-commenter
Copy link

Codecov Report

Attention: Patch coverage is 83.33333% with 2 lines in your changes are missing coverage. Please review.

Project coverage is 81.6%. Comparing base (2d65381) to head (058d72b).

Additional details and impacted files
@@           Coverage Diff           @@
##            v1.18    #1068   +/-   ##
=======================================
  Coverage    81.6%    81.6%           
=======================================
  Files         827      827           
  Lines      225387   225390    +3     
=======================================
+ Hits       183996   184053   +57     
+ Misses      41391    41337   -54     

@lijunwangs lijunwangs merged commit f09d04d into v1.18 Apr 26, 2024
35 checks passed
@lijunwangs lijunwangs deleted the mergify/bp/v1.18/pr-1063 branch April 26, 2024 04:12
Copy link
Author

mergify bot commented Apr 29, 2024

Backports to the stable 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.

mergify bot added a commit that referenced this pull request Apr 29, 2024
#1068)

Disable connection cache warmer for tpu if no rpc services using it.

(cherry picked from commit d87e23d)

# Conflicts:
#	core/src/tvu.rs

* Merge conflicts

---------

Co-authored-by: Lijun Wang <83639177+lijunwangs@users.noreply.github.com>
(cherry picked from commit f09d04d)
lijunwangs pushed a commit that referenced this pull request Apr 29, 2024
#1068)

Disable connection cache warmer for tpu if no rpc services using it.

(cherry picked from commit d87e23d)

# Conflicts:
#	core/src/tvu.rs

* Merge conflicts

---------

Co-authored-by: Lijun Wang <83639177+lijunwangs@users.noreply.github.com>
(cherry picked from commit f09d04d)
lijunwangs pushed a commit that referenced this pull request Apr 30, 2024
… (backport of #1068) (#1108)

v1.18: Disable cache warmer if RPC is not using it (backport of #1063) (#1068)

Disable connection cache warmer for tpu if no rpc services using it.

(cherry picked from commit d87e23d)

# Conflicts:
#	core/src/tvu.rs

* Merge conflicts

---------

Co-authored-by: Lijun Wang <83639177+lijunwangs@users.noreply.github.com>
(cherry picked from commit f09d04d)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
anwayde pushed a commit to firedancer-io/agave that referenced this pull request Jul 23, 2024
…xyz#1063) (anza-xyz#1068)

Disable connection cache warmer for tpu if no rpc services using it.

(cherry picked from commit d87e23d)

# Conflicts:
#	core/src/tvu.rs

* Merge conflicts

---------

Co-authored-by: Lijun Wang <83639177+lijunwangs@users.noreply.github.com>
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.

4 participants