Skip to content

The store DB and the companion BlockStore struct are sometimes out of sync (backport #1856)#1860

Merged
sergio-mena merged 2 commits intov1.xfrom
mergify/bp/v1.x/pr-1856
Dec 19, 2023
Merged

The store DB and the companion BlockStore struct are sometimes out of sync (backport #1856)#1860
sergio-mena merged 2 commits intov1.xfrom
mergify/bp/v1.x/pr-1856

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Dec 19, 2023

This is an automatic backport of pull request #1856 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

…of sync (#1856)

* Repro'ing failure

* Add sleep to try to expose the race condition

* Tune `TestApp_Hash` to ensure repro within a reasonable time

* Ensure block store DB and data struct always show consistent data

* Revert changes that allowed for repro, but shouldn't be committed

* Revert "Tune `TestApp_Hash` to ensure repro within a reasonable time"

* Revert "Repro'ing failure"

* Remove the `time.Sleep`

* Appease linter

* Update internal/store/store.go

Co-authored-by: lasaro <lasaro@informal.systems>

---------

Co-authored-by: lasaro <lasaro@informal.systems>
(cherry picked from commit ed8f87e)
@mergify mergify bot requested a review from a team as a code owner December 19, 2023 11:28
@mergify mergify bot requested a review from a team December 19, 2023 11:28
@sergio-mena sergio-mena added the bug Something isn't working label Dec 19, 2023
@sergio-mena sergio-mena merged commit 3a7efa9 into v1.x Dec 19, 2023
@sergio-mena sergio-mena deleted the mergify/bp/v1.x/pr-1856 branch December 19, 2023 15:03
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.

2 participants