Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Jul 19, 2024

This contains a fix in the ra_directory module to ensure names can be deleted even when a Ra server has never been started during the current node lifetime.

Also contains a small tweak to ensure the ra_directory:unregister_name is called before deleting a Ra data directory which is less likely to cause a corrupt state that will stop a Ra system from starting.


This is an automatic backport of pull request #11765 done by [Mergify](https://mergify.com).
This is an automatic backport of pull request #11768 done by [Mergify](https://mergify.com).

kjnilsson and others added 2 commits July 19, 2024 23:03
This contains a fix in the ra_directory module to ensure
names can be deleted even when a Ra server has never been started
during the current node lifetime.

Also contains a small tweak to ensure the ra_directory:unregister_name
is called before deleting a Ra data directory which is less likely
to cause a corrupt state that will stop a Ra system from starting.

(cherry picked from commit 42991f7)
(cherry picked from commit a6a2f64)

# Conflicts:
#	MODULE.bazel
#	rabbitmq-components.mk
(cherry picked from commit e366b1d)
(cherry picked from commit ba06126)
@mergify mergify bot added the conflicts label Jul 19, 2024
@mergify
Copy link
Author

mergify bot commented Jul 19, 2024

Cherry-pick of a6a2f64 has failed:

On branch mergify/bp/v3.13.x/pr-11768
Your branch is up to date with 'origin/v3.13.x'.

You are currently cherry-picking commit a6a2f645e0.
  (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:   deps/rabbit/src/rabbit_quorum_queue.erl

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   MODULE.bazel
	both modified:   rabbitmq-components.mk

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@michaelklishin michaelklishin added this to the 3.13.5 milestone Jul 19, 2024
@michaelklishin michaelklishin merged commit edb967c into v3.13.x Jul 20, 2024
@michaelklishin michaelklishin deleted the mergify/bp/v3.13.x/pr-11768 branch July 20, 2024 00: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.

3 participants