Skip to content

4.1, by @Ayanda-D: stop QQ replicas when a QQ is forced to shrink to a single replica (backport #12468)#12481

Closed
mergify[bot] wants to merge 5 commits intov4.0.xfrom
mergify/bp/v4.0.x/pr-12468
Closed

4.1, by @Ayanda-D: stop QQ replicas when a QQ is forced to shrink to a single replica (backport #12468)#12481
mergify[bot] wants to merge 5 commits intov4.0.xfrom
mergify/bp/v4.0.x/pr-12468

Conversation

@mergify
Copy link
Copy Markdown

@mergify mergify bot commented Oct 8, 2024

This is #12427 by @Ayanda-D.

Shrinking operations did not stop QQ replicas. This was easy to miss because QQs are usually shrunk before a node is removed from the cluster.

However, there is a scenario where this is not the case. If some nodes (replicas) need to be replaced, in particular when a majority of nodes cannot be recovered for any reasons, the recovery process will involve shrinking a QQ to just one member so that it has an online quorum (of 1 node out of 1) before new replicas can be added.

For this to succeed, the older replicas must be stopped and deleted from the (QQ) cluster.

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

@Ayanda-D @mergify
Shutdown peer QQ FSMs on connected nodes on force-shrink execution fo…
18950d0 
…r cluster

wide consistency, ensuring only the leader is active/running

(cherry picked from commit b675ce2)
(cherry picked from commit d9de6d9)

# Conflicts:
#	deps/rabbit/src/rabbit_quorum_queue.erl
@Ayanda-D @mergify
QQ tests for force-shrink to current member operations
92bc7ac 
(cherry picked from commit 60ee35e)
(cherry picked from commit 10dbde1)

# Conflicts:
#	deps/rabbit/test/quorum_queue_SUITE.erl
@Ayanda-D @mergify
Implement force_vhost_queues_shrink_member_to_current_member/1
bad78a6 
(cherry picked from commit c26aa3b)
(cherry picked from commit b03637f)

# Conflicts:
#	deps/rabbit/src/rabbit_quorum_queue.erl
@Ayanda-D @mergify
Add test for QQ force_vhost_queues_shrink_member_to_current_member/1
7917a8a 
(cherry picked from commit de0c0db)
(cherry picked from commit c9d97e6)

# Conflicts:
#	deps/rabbit/test/quorum_queue_SUITE.erl
@Ayanda-D @mergify
Update QQ force-shrink logging
ea60dae 
(cherry picked from commit dd5ec3c)
(cherry picked from commit 16170d0)

# Conflicts:
#	deps/rabbit/src/rabbit_quorum_queue.erl
@mergify mergify bot added the conflicts label Oct 8, 2024
@mergify
Copy link
Copy Markdown
Author

mergify bot commented Oct 8, 2024

Cherry-pick of d9de6d9 has failed:

On branch mergify/bp/v4.0.x/pr-12468
Your branch is up to date with 'origin/v4.0.x'.

You are currently cherry-picking commit d9de6d989c.
  (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)

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

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 10dbde1 has failed:

On branch mergify/bp/v4.0.x/pr-12468
Your branch is ahead of 'origin/v4.0.x' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 10dbde1f71.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   deps/rabbit/test/quorum_queue_SUITE.erl

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of b03637f has failed:

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

You are currently cherry-picking commit b03637f8ec.
  (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)

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

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of c9d97e6 has failed:

On branch mergify/bp/v4.0.x/pr-12468
Your branch is ahead of 'origin/v4.0.x' by 3 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit c9d97e61de.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   deps/rabbit/test/quorum_queue_SUITE.erl

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 16170d0 has failed:

On branch mergify/bp/v4.0.x/pr-12468
Your branch is ahead of 'origin/v4.0.x' by 4 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 16170d093b.
  (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)

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

no changes added to commit (use "git add" and/or "git commit -a")

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

@mergify mergify bot mentioned this pull request Oct 8, 2024
Merged
@michaelklishin
Copy link
Copy Markdown
Collaborator

michaelklishin commented Oct 8, 2024

Already backported manually.

@michaelklishin michaelklishin deleted the mergify/bp/v4.0.x/pr-12468 branch October 8, 2024 00:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

conflicts

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@michaelklishin @Ayanda-D