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 quorum queue queue federation bugs (backport #8282) (backport #8328) #8336

Merged
merged 4 commits into from
May 25, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented May 25, 2023

This is an automatic backport of pull request #8328 done by Mergify.
Cherry-pick of 1c59dd5 has failed:

On branch mergify/bp/v3.11.x/pr-8328
Your branch is ahead of 'origin/v3.11.x' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 1c59dd5361.
  (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/rabbitmq_federation/src/rabbit_federation_queue_link.erl

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   deps/rabbitmq_federation/src/rabbit_federation_link_util.erl
	both modified:   deps/rabbitmq_federation/src/rabbit_federation_upstream.erl

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

kjnilsson and others added 3 commits May 25, 2023 09:30
Quorum queues would due to a misunderstanding whilst porting
queue decorators from classic queues calculate the wrong maximum
consumer priority leading to strange behaviour when using queue
federation.

Also notify decorators on startup. In this case we had to do this
when a member becomes leader which isn't always at startup so
will have to rely on the mirroried supervisor to ensure we don't
start multiple federation links.

(cherry picked from commit 21b9eb5)
(cherry picked from commit 26521eb)
(cherry picked from commit 1c727a4)
(cherry picked from commit 4b17d59)
around federated queue link state transitions (pause/unpause).

References #8297.

(cherry picked from commit 958043c)
(cherry picked from commit 1c59dd5)

# Conflicts:
#	deps/rabbitmq_federation/src/rabbit_federation_link_util.erl
#	deps/rabbitmq_federation/src/rabbit_federation_upstream.erl
@mergify mergify bot added the conflicts label May 25, 2023
@michaelklishin michaelklishin merged commit 561134e into v3.11.x May 25, 2023
@michaelklishin michaelklishin deleted the mergify/bp/v3.11.x/pr-8328 branch May 25, 2023 09:49
@michaelklishin michaelklishin added this to the 3.11.17 milestone Jan 3, 2024
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.

2 participants