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

abci: change client to use multi-reader mutexes (backport #6306) #6873

Merged
merged 3 commits into from Aug 30, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 30, 2021

This is an automatic backport of pull request #6306 done by Mergify.
Cherry-pick of 1c4dbe3 has failed:

On branch mergify/bp/v0.34.x/pr-6306
Your branch is up to date with 'origin/v0.34.x'.

You are currently cherry-picking commit 1c4dbe30d.
  (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:   abci/client/client.go
	modified:   abci/client/grpc_client.go
	modified:   abci/client/socket_client.go
	modified:   consensus/common_test.go
	modified:   consensus/reactor_test.go
	modified:   proxy/client.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   abci/client/local_client.go
	both modified:   consensus/byzantine_test.go

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.io/

(cherry picked from commit 1c4dbe3)

# Conflicts:
#	abci/client/local_client.go
#	consensus/byzantine_test.go
@lgtm-com
Copy link

lgtm-com bot commented Aug 30, 2021

This pull request introduces 1 alert when merging 279f806 into 0c05841 - view on LGTM.com

new alerts:

  • 1 for Unreachable statement

@tessr
Copy link
Contributor

tessr commented Aug 30, 2021

@tychoish can you resolve the conflicts here and then we can talk about doing another 0.34 release to get the changes out requested by Terra?

@codecov
Copy link

codecov bot commented Aug 30, 2021

Codecov Report

❗ No coverage uploaded for pull request base (v0.34.x@0c05841). Click here to learn what that means.
The diff coverage is n/a.

@@            Coverage Diff             @@
##             v0.34.x    #6873   +/-   ##
==========================================
  Coverage           ?   61.50%           
==========================================
  Files              ?      265           
  Lines              ?    27767           
  Branches           ?        0           
==========================================
  Hits               ?    17077           
  Misses             ?     9130           
  Partials           ?     1560           

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants