Skip to content

refactor: make cachekv store thread-safe again (backport #14378)#14818

Merged
julienrbrt merged 3 commits intorelease/v0.47.xfrom
mergify/bp/release/v0.47.x/pr-14378
Jan 31, 2023
Merged

refactor: make cachekv store thread-safe again (backport #14378)#14818
julienrbrt merged 3 commits intorelease/v0.47.xfrom
mergify/bp/release/v0.47.x/pr-14378

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Jan 27, 2023

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

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

You are currently cherry-picking commit f1ee974ec.
  (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/cachekv/internal/btree_test.go
	modified:   store/cachekv/store.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   store/cachekv/internal/btree.go
	both modified:   store/cachekv/internal/memiterator.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

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>
(cherry picked from commit f1ee974)

# Conflicts:
#	CHANGELOG.md
#	store/cachekv/internal/btree.go
#	store/cachekv/internal/memiterator.go
@mergify mergify bot requested a review from a team January 27, 2023 14:26
@mergify mergify bot added the conflicts label Jan 27, 2023
@yihuang yihuang removed the conflicts label Jan 27, 2023
@julienrbrt julienrbrt merged commit 35cd757 into release/v0.47.x Jan 31, 2023
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.47.x/pr-14378 branch January 31, 2023 13:37
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.

4 participants