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: default staked client in LocalCluster (backport of #716) #724

Merged
merged 2 commits into from
Apr 10, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Apr 10, 2024

Problem

Summary of Changes

  • LocalCluster connection cache defaults to use a client id with stake override to treat it like staked connection

Fixes #


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

* default staked client in LocalCluster

* fix underflow

(cherry picked from commit e91a5e2)

# Conflicts:
#	local-cluster/tests/local_cluster.rs
@mergify mergify bot added the conflicts label Apr 10, 2024
Copy link
Author

mergify bot commented Apr 10, 2024

Cherry-pick of e91a5e2 has failed:

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

You are currently cherry-picking commit e91a5e2744.
  (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:   local-cluster/src/local_cluster.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   local-cluster/tests/local_cluster.rs

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 Report

All modified and coverable lines are covered by tests ✅

Project coverage is 81.5%. Comparing base (7b8ed3b) to head (945216b).

Additional details and impacted files
@@            Coverage Diff            @@
##            v1.18     #724     +/-   ##
=========================================
- Coverage    81.5%    81.5%   -0.1%     
=========================================
  Files         827      827             
  Lines      224833   224833             
=========================================
- Hits       183453   183418     -35     
- Misses      41380    41415     +35     

@t-nelson t-nelson merged commit cf5e8d3 into v1.18 Apr 10, 2024
35 checks passed
@t-nelson t-nelson deleted the mergify/bp/v1.18/pr-716 branch April 10, 2024 23:01
anwayde pushed a commit to firedancer-io/agave that referenced this pull request Jul 23, 2024
… (anza-xyz#724)

* default staked client in LocalCluster (anza-xyz#716)

* default staked client in LocalCluster

* fix underflow

(cherry picked from commit e91a5e2)

# Conflicts:
#	local-cluster/tests/local_cluster.rs

* resolve conflicts

---------

Co-authored-by: Andrew Fitzgerald <apfitzge@gmail.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.

3 participants