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.17: corrected to not use hardcoded connections count for unstaked (backport of #633) #762

Merged
merged 2 commits into from
Apr 30, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Apr 11, 2024

The max unstaked connections can be passed in value in spawn_server. This will make the QOS incorrectly accounting for the real passed in unstaked max connection count. This is used by jito-relayers.

Do not use the hardcoded one.


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

@mergify mergify bot added the conflicts label Apr 11, 2024
Copy link
Author

mergify bot commented Apr 11, 2024

Cherry-pick of 592107a has failed:

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

You are currently cherry-picking commit 592107a907.
  (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/rm <file>..." as appropriate to mark resolution)
	both modified:   streamer/src/nonblocking/quic.rs
	deleted by us:   streamer/src/nonblocking/stream_throttle.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

@codecov-commenter
Copy link

codecov-commenter commented Apr 11, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 81.6%. Comparing base (4f9c393) to head (5148853).

Additional details and impacted files
@@           Coverage Diff           @@
##            v1.17     #762   +/-   ##
=======================================
  Coverage    81.6%    81.6%           
=======================================
  Files         806      806           
  Lines      219348   219348           
=======================================
+ Hits       179078   179081    +3     
+ Misses      40270    40267    -3     

@lijunwangs
Copy link

@t-nelson and @sakridge can you review this simple change please? Thanks

pgarg66
pgarg66 previously approved these changes Apr 29, 2024
t-nelson
t-nelson previously approved these changes Apr 29, 2024
* corrected to not use hardcoded connections count for unstaked

* Fixed a math problem on max_unstaked_load_in_throttling_window

* Fixed a unit test failure

(cherry picked from commit 592107a)

# Conflicts:
#	streamer/src/nonblocking/quic.rs
#	streamer/src/nonblocking/stream_throttle.rs
@lijunwangs lijunwangs dismissed stale reviews from t-nelson and pgarg66 via 5148853 April 30, 2024 19:06
@mergify mergify bot requested review from a team as code owners April 30, 2024 19:06
@lijunwangs lijunwangs merged commit 19dea1d into v1.17 Apr 30, 2024
33 checks passed
@lijunwangs lijunwangs deleted the mergify/bp/v1.17/pr-633 branch April 30, 2024 23:37
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.

5 participants