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

rabbit_quorum_queue: Wait for member add in add_member/4 (backport #12837) #12850

Merged
merged 1 commit into from
Nov 28, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 28, 2024

Why

The ra:member_add/3 call returns before the change is committed. This is ok for that addition but any follow-up changes to the cluster might be rejected with the cluster_change_not_permitted error.

How

Instead of changing other places to wait or retry their cluster membership change, this patch waits for the current add to be applied before proceeding and returning.

This fixes some transient failures in CI where such follow-up changes are rejected and not retried, leaving the cluster in an unexpected state for the testcase.

An example is with quorum_queue_SUITE:force_shrink_member_to_current_member/1


This is an automatic backport of pull request #12837 done by Mergify.

[Why]
The `ra:member_add/3` call returns before the change is committed. This
is ok for that addition but any follow-up changes to the cluster might
be rejected with the `cluster_change_not_permitted` error.

[How]
Instead of changing other places to wait or retry their cluster
membership change, this patch waits for the current add to be applied
before proceeding and returning.

This fixes some transient failures in CI where such follow-up changes
are rejected and not retried, leaving the cluster in an unexpected state
for the testcase.

An example is with
`quorum_queue_SUITE:force_shrink_member_to_current_member/1`

(cherry picked from commit 99d8e90)
@michaelklishin michaelklishin added this to the 4.0.5 milestone Nov 28, 2024
@michaelklishin michaelklishin merged commit 1edb047 into v4.0.x Nov 28, 2024
193 checks passed
@michaelklishin michaelklishin deleted the mergify/bp/v4.0.x/pr-12837 branch November 28, 2024 22:20
@michaelklishin
Copy link
Member

The failure is unrelated and was/is being addressed separately

dumbbell added a commit that referenced this pull request Nov 29, 2024
... instead of 4.0.3.

[Why]
We need the following bugfixes:
* one in the Khepri reset code backported in #12739 and published in
  RabbitMQ 4.0.4.
* one in the quorum queue code backported in #12850 and published in
  RabbitMQ 4.0.5.
dumbbell added a commit that referenced this pull request Dec 2, 2024
... instead of 4.0.3.

[Why]
We need the following bugfixes:
* one in the Khepri reset code backported in #12739 and published in
  RabbitMQ 4.0.4.
* one in the quorum queue code backported in #12850 and published in
  RabbitMQ 4.0.5.
dumbbell added a commit that referenced this pull request Dec 2, 2024
... instead of 4.0.3.

[Why]
We need the following bugfixes:
* one in the Khepri reset code backported in #12739 and published in
  RabbitMQ 4.0.4.
* one in the quorum queue code backported in #12850 and published in
  RabbitMQ 4.0.5.
dumbbell added a commit that referenced this pull request Dec 2, 2024
... instead of 4.0.3.

[Why]
We need the following bugfixes:
* one in the Khepri reset code backported in #12739 and published in
  RabbitMQ 4.0.4.
* one in the quorum queue code backported in #12850 and published in
  RabbitMQ 4.0.5.
dumbbell added a commit that referenced this pull request Dec 17, 2024
... instead of 4.0.3.

[Why]
We need the following bugfixes:
* one in the Khepri reset code backported in #12739 and published in
  RabbitMQ 4.0.4.
* one in the quorum queue code backported in #12850 and published in
  RabbitMQ 4.0.5.
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.

2 participants