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

fix: state listener could observe discarded writes (backport #13459) #13462

Merged
merged 3 commits into from Oct 6, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 6, 2022

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

On branch mergify/bp/release/v0.46.x/pr-13459
Your branch is up to date with 'origin/release/v0.46.x'.

You are currently cherry-picking commit bb54c597d.
  (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:   store/cachemulti/store.go
	modified:   store/rootmulti/store_test.go

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

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

* fix: state listener could observe uncommitted writes

Closes: #13457

don't pass listeners to nested cached store,
only the most inner layer's cache writes should be observed.

* Update CHANGELOG.md

* add unit test

* rename

Co-authored-by: Marko <marbar3778@yahoo.com>
(cherry picked from commit bb54c59)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot requested a review from a team as a code owner October 6, 2022 11:42
@mergify mergify bot added the conflicts label Oct 6, 2022
CHANGELOG.md Outdated Show resolved Hide resolved
@tac0turtle tac0turtle merged commit cb676e2 into release/v0.46.x Oct 6, 2022
@tac0turtle tac0turtle deleted the mergify/bp/release/v0.46.x/pr-13459 branch October 6, 2022 13:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants