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

Blockstore should drop signals before validator exit (backport #24025) #25326

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 #24025 done by Mergify.
Cherry-pick of 6ba4e87 has failed:

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

You are currently cherry-picking commit 6ba4e870c.
  (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:   core/src/validator.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   ledger/src/blockstore.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 20, 2022 09:34
* 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

* wip

* 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

* clean up import

* add mutex for signal senders in blockstore

* remove mut

* refactor: extract add signal functions

* make blockstore signal private

* let compiler infer mutex type

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

# Conflicts:
#	ledger/src/blockstore.rs
@HaoranYi HaoranYi force-pushed the mergify/bp/v1.10/pr-24025 branch from 777fa02 to 657f393 Compare May 20, 2022 14:34
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label May 20, 2022
@codecov
Copy link

codecov bot commented May 20, 2022

Codecov Report

Merging #25326 (657f393) into v1.10 (86ecb28) will decrease coverage by 0.0%.
The diff coverage is 100.0%.

@@            Coverage Diff            @@
##            v1.10   #25326     +/-   ##
=========================================
- Coverage    81.5%    81.5%   -0.1%     
=========================================
  Files         595      595             
  Lines      162196   162215     +19     
=========================================
- Hits       132245   132236      -9     
- Misses      29951    29979     +28     

@mergify mergify bot merged commit bfb2ada into v1.10 May 20, 2022
@mergify mergify bot deleted the mergify/bp/v1.10/pr-24025 branch May 20, 2022 16:32
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