Skip to content

mempool: Fix data races in CListMempool's height and notifiedTxsAvailable (backport #2021)#2029

Merged
hvanz merged 2 commits intov1.xfrom
mergify/bp/v1.x/pr-2021
Jan 12, 2024
Merged

mempool: Fix data races in CListMempool's height and notifiedTxsAvailable (backport #2021)#2029
hvanz merged 2 commits intov1.xfrom
mergify/bp/v1.x/pr-2021

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jan 12, 2024

This is an automatic backport of pull request #2021 done by Mergify.
Cherry-pick of ce6d2fb has failed:

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

You are currently cherry-picking commit ce6d2fb8e.
  (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:
	new file:   .changelog/unreleased/bug-fixes/642-clist-mempool-data-races.md
	modified:   mempool/clist_mempool.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   mempool/clist_mempool_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.com

…able (#2021)

Addresses #642

---

#### PR checklist

- [X] Tests written/updated
- [x] Changelog entry added in `.changelog` (we use
[unclog](https://github.com/informalsystems/unclog) to manage our
changelog)
- [ ] Updated relevant documentation (`docs/` or `spec/`) and code
comments

(cherry picked from commit ce6d2fb)

# Conflicts:
#	mempool/clist_mempool_test.go
@mergify mergify bot requested a review from a team as a code owner January 12, 2024 16:04
@mergify mergify bot requested a review from a team January 12, 2024 16:04
@mergify mergify bot added the conflicts label Jan 12, 2024
@hvanz hvanz merged commit 89a5642 into v1.x Jan 12, 2024
@hvanz hvanz deleted the mergify/bp/v1.x/pr-2021 branch January 12, 2024 16:19
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.

1 participant