Skip to content

Fix race condition in consensus.State code (backport #673)#690

Merged
sergio-mena merged 1 commit intov0.37.xfrom
mergify/bp/v0.37.x/pr-673
Apr 11, 2023
Merged

Fix race condition in consensus.State code (backport #673)#690
sergio-mena merged 1 commit intov0.37.xfrom
mergify/bp/v0.37.x/pr-673

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Apr 11, 2023

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


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

* Repro in e2e tests

* Change something in the code

* Fix race condition in `SwitchToConsensus`

* Revert "Repro in e2e tests"

This reverts commit 4f441f8.

* RAII lock

(cherry picked from commit 6a96eca)
@mergify mergify bot requested a review from a team as a code owner April 11, 2023 10:08
@sergio-mena sergio-mena self-assigned this Apr 11, 2023
@sergio-mena sergio-mena added the bug Something isn't working label Apr 11, 2023
@sergio-mena sergio-mena merged commit e0b2aae into v0.37.x Apr 11, 2023
@sergio-mena sergio-mena deleted the mergify/bp/v0.37.x/pr-673 branch April 11, 2023 10:33
mark-rushakoff added a commit to cosmos/cosmos-sdk that referenced this pull request Apr 11, 2023
This includes two fixes for two data races that occasionally happen in
Cosmos SDK tests: cometbft/cometbft#690 and
cometbft/cometbft#532.

We will eventually be switching to CometBFT v0.38 (see #15519), which
also contains those fixes.
roy-dydx pushed a commit to dydxprotocol/cometbft that referenced this pull request Jul 11, 2023
* Repro in e2e tests

* Change something in the code

* Fix race condition in `SwitchToConsensus`

* Revert "Repro in e2e tests"

This reverts commit 4f441f8.

* RAII lock

(cherry picked from commit 6a96eca)

Co-authored-by: Sergio Mena <sergio@informal.systems>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working

Projects

No open projects
Status: Done

Development

Successfully merging this pull request may close these issues.

1 participant