Skip to content
This repository has been archived by the owner on Jan 13, 2025. It is now read-only.

Time out async sends to avoid slackers stuck in the queue for too long (backport #28545) #28732

Merged
merged 3 commits into from
Nov 3, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 3, 2022

This is an automatic backport of pull request #28545 done by Mergify.
Cherry-pick of f10ef76 has failed:

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

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

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

#28545)

* Time out async sends to avoid slackers stuck in the queue for too long

* Fixed a clippy error

* Added stats for timeout counts

* Link with stats correctly

(cherry picked from commit f10ef76)

# Conflicts:
#	tpu-client/src/connection_cache_stats.rs
@mergify mergify bot added the conflicts label Nov 3, 2022
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Nov 3, 2022
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Nov 3, 2022
@solana-grimes
Copy link
Contributor

😱 New commits were pushed while the automerge label was present.

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Nov 3, 2022
@mergify mergify bot merged commit 527e2d4 into v1.14 Nov 3, 2022
@mergify mergify bot deleted the mergify/bp/v1.14/pr-28545 branch November 3, 2022 02:35
mergify bot added a commit that referenced this pull request Nov 3, 2022
…g (backport #28545) (#28732)

* Time out async sends to avoid slackers stuck in the queue for too long (#28545)

* Time out async sends to avoid slackers stuck in the queue for too long

* Fixed a clippy error

* Added stats for timeout counts

* Link with stats correctly

(cherry picked from commit f10ef76)

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

* Fixed merge issue

* fmt code

Co-authored-by: Lijun Wang <83639177+lijunwangs@users.noreply.github.com>
(cherry picked from commit 527e2d4)
lijunwangs added a commit to lijunwangs/solana that referenced this pull request Nov 5, 2022
…g (backport solana-labs#28545) (solana-labs#28732)

* Time out async sends to avoid slackers stuck in the queue for too long (solana-labs#28545)

* Time out async sends to avoid slackers stuck in the queue for too long

* Fixed a clippy error

* Added stats for timeout counts

* Link with stats correctly

(cherry picked from commit f10ef76)

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

* Fixed merge issue

* fmt code

Co-authored-by: Lijun Wang <83639177+lijunwangs@users.noreply.github.com>
lijunwangs added a commit that referenced this pull request Nov 10, 2022
Time out async sends to avoid slackers stuck in the queue for too long (backport #28545) (#28732)

* Time out async sends to avoid slackers stuck in the queue for too long (#28545)

* Time out async sends to avoid slackers stuck in the queue for too long

* Fixed a clippy error

* Added stats for timeout counts

* Link with stats correctly

(cherry picked from commit f10ef76)

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

* Fixed merge issue

* fmt code

Co-authored-by: Lijun Wang <83639177+lijunwangs@users.noreply.github.com>

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
automerge Merge this Pull Request automatically once CI passes conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants