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

CQ: Fix a crash when CMQ master changes in mixed environment test (backport #9507) #9508

Merged
merged 1 commit into from
Sep 21, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Sep 21, 2023

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


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

When policies are applied to change a CMQ master, and that master
moves from 3.13 to 3.12, this triggers a CQ version change
(because it defaults to v2 in 3.13 but v1 in 3.12). which
leads to a crash because the files on disk have an index entry
for messages that are in memory only.

The index entry is only created with CMQs, normal CQs prohibit
this behavior. Since we are going to remove CMQs "soon" the
solution to fix the crash was to simply ignore the index entry
when we know the message is already in memory.

(cherry picked from commit 90e871d)
@HoloRin HoloRin added this to the 3.12.6 milestone Sep 21, 2023
@HoloRin HoloRin merged commit 0341b5f into v3.12.x Sep 21, 2023
13 checks passed
@HoloRin HoloRin deleted the mergify/bp/v3.12.x/pr-9507 branch September 21, 2023 14:02
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.

3 participants