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

Modify rpc_completed_slot_service to be non-blocking (backport #24007) #25324

Merged
merged 2 commits into from
May 20, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 18, 2022

This is an automatic backport of pull request #24007 done by Mergify.
Cherry-pick of 51b37f0 has failed:

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

You are currently cherry-picking commit 51b37f018.
  (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:   rpc/src/rpc_completed_slots_service.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   core/src/validator.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

@mergify mergify bot added the conflicts label May 18, 2022
HaoranYi added 2 commits May 19, 2022 15:46
* timeout for validator exits

* clippy

* print backtrace when panic

* add backtrace package

* increase time out to 30s

* debug logging

* make rpc complete service non blocking

* reduce log level

* remove logging

* recv_timeout

* remove backtrace

* remove sleep

* remove unused variable

* add comments

* Update core/src/validator.rs

Co-authored-by: Trent Nelson <[email protected]>

* Update core/src/validator.rs

Co-authored-by: Trent Nelson <[email protected]>

* whitespace

* more whitespace

* fix build

Co-authored-by: Trent Nelson <[email protected]>
(cherry picked from commit 51b37f0)

# Conflicts:
#	core/src/validator.rs
@HaoranYi HaoranYi force-pushed the mergify/bp/v1.10/pr-24007 branch from de30944 to 9dff566 Compare May 19, 2022 20:46
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label May 19, 2022
@codecov
Copy link

codecov bot commented May 20, 2022

Codecov Report

Merging #25324 (9dff566) into v1.10 (d1bde17) will decrease coverage by 0.0%.
The diff coverage is 79.1%.

@@            Coverage Diff            @@
##            v1.10   #25324     +/-   ##
=========================================
- Coverage    81.5%    81.5%   -0.1%     
=========================================
  Files         588      591      +3     
  Lines      160624   161929   +1305     
=========================================
+ Hits       130961   131975   +1014     
- Misses      29663    29954    +291     

@mergify mergify bot merged commit 3b4d252 into v1.10 May 20, 2022
@mergify mergify bot deleted the mergify/bp/v1.10/pr-24007 branch May 20, 2022 00:14
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