Skip to content

ABCI: Fix ReCheckTx for Socket Client (bp #6124)#6125

Merged
alexanderbez merged 2 commits intov0.34.xfrom
mergify/bp/v0.34.x/pr-6124
Feb 18, 2021
Merged

ABCI: Fix ReCheckTx for Socket Client (bp #6124)#6125
alexanderbez merged 2 commits intov0.34.xfrom
mergify/bp/v0.34.x/pr-6124

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Feb 17, 2021

This is an automatic backport of pull request #6124 done by Mergify.

Cherry-pick of 5b52f87 has failed:

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

You are currently cherry-picking commit 5b52f8778.
  (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/socket_client.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG_PENDING.md

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/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/

Fixes the race condition between a callback being set and called during ReCheckTx. Note, I do not see equivalent logic in the gRPC client (anymore) as #5439 suggests, so only the socket client was updated.

closes: #5439

(cherry picked from commit 5b52f87)

# Conflicts:
#	CHANGELOG_PENDING.md
@codecov
Copy link

codecov bot commented Feb 17, 2021

Codecov Report

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

@@            Coverage Diff             @@
##             v0.34.x    #6125   +/-   ##
==========================================
  Coverage           ?   60.62%           
==========================================
  Files              ?      263           
  Lines              ?    23880           
  Branches           ?        0           
==========================================
  Hits               ?    14478           
  Misses             ?     7924           
  Partials           ?     1478           

@alexanderbez alexanderbez self-assigned this Feb 17, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants