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

Use batch send in bench-tps to send transactions (backport #27527) #27560

Merged
merged 2 commits into from
Sep 1, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 1, 2022

This is an automatic backport of pull request #27527 done by Mergify.
Cherry-pick of 49df1c4 has failed:

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

You are currently cherry-picking commit 49df1c47e.
  (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:   bench-tps/src/bench_tps_client/tpu_client.rs
	modified:   client/src/nonblocking/tpu_client.rs

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   tpu-client/src/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

* Use batch send in bench-tps to send transactions

* serialize using par iter

(cherry picked from commit 49df1c4)

# Conflicts:
#	tpu-client/src/tpu_client.rs
@mergify mergify bot added the conflicts label Sep 1, 2022
@mergify mergify bot assigned pgarg66 Sep 1, 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 Sep 1, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Sep 1, 2022

automerge label removed due to a CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Sep 1, 2022
@mergify mergify bot merged commit ca6a8a8 into v1.11 Sep 1, 2022
@mergify mergify bot deleted the mergify/bp/v1.11/pr-27527 branch September 1, 2022 23:36
lijunwangs pushed a commit to lijunwangs/solana that referenced this pull request Sep 10, 2022
…s#27527) (solana-labs#27560)

* Use batch send in bench-tps to send transactions (solana-labs#27527)

* Use batch send in bench-tps to send transactions

* serialize using par iter

(cherry picked from commit 49df1c4)

# Conflicts:
#	tpu-client/src/tpu_client.rs

* fix merge issues

Co-authored-by: Pankaj Garg <[email protected]>
lijunwangs pushed a commit to lijunwangs/solana that referenced this pull request Sep 13, 2022
…s#27527) (solana-labs#27560)

* Use batch send in bench-tps to send transactions (solana-labs#27527)

* Use batch send in bench-tps to send transactions

* serialize using par iter

(cherry picked from commit 49df1c4)

# Conflicts:
#	tpu-client/src/tpu_client.rs

* fix merge issues

Co-authored-by: Pankaj Garg <[email protected]>
lijunwangs pushed a commit to lijunwangs/solana that referenced this pull request Sep 13, 2022
…s#27527) (solana-labs#27560)

* Use batch send in bench-tps to send transactions (solana-labs#27527)

* Use batch send in bench-tps to send transactions

* serialize using par iter

(cherry picked from commit 49df1c4)

# Conflicts:
#	tpu-client/src/tpu_client.rs

* fix merge issues

Co-authored-by: Pankaj Garg <[email protected]>
lijunwangs pushed a commit to lijunwangs/solana that referenced this pull request Sep 13, 2022
…s#27527) (solana-labs#27560)

* Use batch send in bench-tps to send transactions (solana-labs#27527)

* Use batch send in bench-tps to send transactions

* serialize using par iter

(cherry picked from commit 49df1c4)

# Conflicts:
#	tpu-client/src/tpu_client.rs

* fix merge issues

Co-authored-by: Pankaj Garg <[email protected]>
lijunwangs pushed a commit that referenced this pull request Sep 14, 2022
…27560)

* Use batch send in bench-tps to send transactions (#27527)

* Use batch send in bench-tps to send transactions

* serialize using par iter

(cherry picked from commit 49df1c4)

# Conflicts:
#	tpu-client/src/tpu_client.rs

* fix merge issues

Co-authored-by: Pankaj Garg <[email protected]>
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.

1 participant