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

client: Use async connection in async TPU client (backport #25969) #26505

Merged
merged 3 commits into from Jul 8, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 8, 2022

This is an automatic backport of pull request #25969 done by Mergify.
Cherry-pick of 2436a2b has failed:

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

You are currently cherry-picking commit 2436a2bea.
  (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:   client/src/connection_cache.rs
	modified:   client/src/nonblocking/quic_client.rs
	modified:   client/src/nonblocking/tpu_connection.rs
	modified:   client/src/nonblocking/udp_client.rs
	modified:   client/src/quic_client.rs
	modified:   client/src/tpu_connection.rs
	modified:   client/src/udp_client.rs
	modified:   client/tests/quic_client.rs

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   Cargo.lock
	both modified:   client/Cargo.toml
	deleted by us:   client/src/nonblocking/tpu_client.rs

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* client: Add nonblocking QuicTpuConnection implementation

* Remove integer arithmetic

* client: Support sync and async connections in cache

* client: Use async connection in async TPU client

* Address feedback

* Rename Connection -> BaseTpuConnection

(cherry picked from commit 2436a2b)

# Conflicts:
#	Cargo.lock
#	client/Cargo.toml
#	client/src/nonblocking/tpu_client.rs
@mergify mergify bot added the conflicts label Jul 8, 2022
@mergify mergify bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Jul 8, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Jul 8, 2022

automerge label removed due to a CI failure

@mergify mergify bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Jul 8, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Jul 8, 2022

automerge label removed due to a CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jul 8, 2022
@pgarg66 pgarg66 merged commit ed06b5b into v1.10 Jul 8, 2022
@pgarg66 pgarg66 deleted the mergify/bp/v1.10/pr-25969 branch July 8, 2022 18:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge Merge this Pull Request automatically once CI passes conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants