Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Jul 19, 2024

This contains an important bugfix to an issue introduced in 2.11.0 where a segment writer may crash during recovery.

See: #11712


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

This contains an important bugfix to an issue introduced in
2.11.0 where a segment writer may crash during recovery.

(cherry picked from commit b225fb9)
(cherry picked from commit 0de2d1d)

# Conflicts:
#	MODULE.bazel
#	rabbitmq-components.mk
@mergify mergify bot added the conflicts label Jul 19, 2024
@mergify
Copy link
Author

mergify bot commented Jul 19, 2024

Cherry-pick of 0de2d1d has failed:

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

You are currently cherry-picking commit 0de2d1df7c.
  (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:   MODULE.bazel
	both modified:   rabbitmq-components.mk

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

@michaelklishin
Copy link
Collaborator

RabbitMQ needs adapting for Ra 2.13.x so there likely will be a new Ra 2.11.x release. Not closing this PR yet to see what a test suite re-run reveals.

michaelklishin and others added 2 commits July 19, 2024 11:57
This reverts commit a4e8e74.

The consensus on the team is that this should
be handled in Ra.
@michaelklishin
Copy link
Collaborator

Closing in favor of #11765 (or rather, its future backport).

@michaelklishin michaelklishin deleted the mergify/bp/v3.13.x/pr-11761 branch July 19, 2024 17:59
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