Skip to content

For 4.1.x, by @aaron-seo: introduce a command that would force QQs to take a checkpoint and truncate its segments (backport #13548) #13938

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 8 commits into from
May 23, 2025
Merged

For 4.1.x, by @aaron-seo: introduce a command that would force QQs to take a checkpoint and truncate its segments (backport #13548) #13938

merged 8 commits into from
May 23, 2025

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented May 23, 2025

This is #13175 by @aaron-seo plus some changes from me that to address the QA feedback from @kjnilsson.

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

aaron-seo and others added 7 commits May 23, 2025 03:12
@aaron-seo @mergify
Add force checkpoint functions for quorum queues and command line tool
d2dcc61 
(cherry picked from commit b54ab1d)
(cherry picked from commit 0d3dfd9)

# Conflicts:
#	deps/rabbit/src/rabbit_quorum_queue.erl
@aaron-seo @mergify
Fix force_checkpoint tests and CLI command
66d4245 
(cherry picked from commit 12bf3e0)

Conflicts:
	deps/rabbit/src/rabbit_quorum_queue.erl
(cherry picked from commit fa31086)
@aaron-seo @mergify
Add timeout to rpc call for force_checkpoint
9bc9276 
(cherry picked from commit 4439150)
(cherry picked from commit 6a78e9f)
@michaelklishin @mergify
Update a #13175 test to not use private Ra machine state
e7e1fb7 
(cherry picked from commit e49acf9)
(cherry picked from commit d54fee2)
@michaelklishin @mergify
Quorum queue machine: do not publish certain state records
1a998f8 
we can use log state in tests.

(cherry picked from commit d17b085)
@michaelklishin @mergify
quorum_queue_SUITE: keep Raft state logging in force_checkpoint_on_queue
901343d 
(cherry picked from commit 7d3292c)
@dcorbacho @mergify
Force checkpoint in all members
79aa0bb 
(cherry picked from commit 0c2b6a1)
@mergify mergify bot added the conflicts label May 23, 2025
@mergify Mergify
Copy link
Author

mergify bot commented May 23, 2025

Cherry-pick of 0d3dfd9 has failed:

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

You are currently cherry-picking commit 0d3dfd969.
  (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/test/quorum_queue_SUITE.erl
	new file:   deps/rabbitmq_cli/lib/rabbitmq/cli/queues/commands/force_checkpoint_command.ex
	new file:   deps/rabbitmq_cli/test/queues/force_checkpoint_command_test.exs

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

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 added the conflicts label May 23, 2025
@michaelklishin michaelklishin added this to the 4.1.1 milestone May 23, 2025
@michaelklishin
Copy link
Collaborator

@dcorbacho @ikavgo can you please take a look at the conflict resolution and v4.1.x adaptation commit I ended up with?

@ikavgo
Copy link
Contributor

ikavgo commented May 23, 2025 •
edited
Loading

That committed conflict is a bit confusing, only exported functions without bodies. Otherwise looks ok...

@ikavgo ikavgo merged commit eb7a6c7 into v4.1.x May 23, 2025
539 of 541 checks passed
@ikavgo ikavgo deleted the mergify/bp/v4.1.x/pr-13548 branch May 23, 2025 08:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@michaelklishin michaelklishin

Labels
conflicts
Projects
None yet
Milestone
4.1.1
Development

Successfully merging this pull request may close these issues.
4 participants
@michaelklishin @ikavgo @aaron-seo @dcorbacho