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

Remove pre-virtual_host_metadata feature flag compatibility code (backport #5236) #5409

Merged
merged 4 commits into from Aug 1, 2022

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Aug 1, 2022

This is an automatic backport of pull request #5236 done by Mergify.
Cherry-pick of 776b432 has failed:

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

You are currently cherry-picking commit 776b4323bd.
  (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/cluster_SUITE.erl
	modified:   deps/rabbit/test/definition_import_SUITE.erl
	modified:   deps/rabbitmq_management/test/rabbit_mgmt_http_SUITE.erl
	modified:   deps/rabbitmq_stream/test/rabbit_stream_SUITE.erl

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

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


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

This feature flag was introduced because a new field was added to the
`#vhost{}` record. This was a breaking change the feature flag allowed a
RabbitMQ cluster to be upgraded one node at a time, without having to
stop the entire cluster.

The compatibility code is in the wild for long enough that we want to
support the new `#vhost{}` record only from now on. The
`virtual_host_metadata` feature flag was marked as required in a
previous commit (see #5202). This allows us to remove code in this
patch.

References #5215.

(cherry picked from commit 29b80bd)
…e flags

These checks are now irrelevant as the feature flag is required.

(cherry picked from commit 776b432)

# Conflicts:
#	deps/rabbit/test/quorum_queue_SUITE.erl
@michaelklishin michaelklishin merged commit 871f1ff into v3.11.x Aug 1, 2022
@michaelklishin michaelklishin deleted the mergify/bp/v3.11.x/pr-5236 branch August 1, 2022 18:25
dumbbell added a commit that referenced this pull request Aug 3, 2022
…5236"

Two reasons:
1. It was too early to backport.
2. There are at least two pull requests to backport first to avoid
   conflicts.

This reverts commit 871f1ff, reversing
changes made to adaf46b.
@dumbbell
Copy link
Member

dumbbell commented Aug 4, 2022

This pull request was reverted and replaced by #5435.

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.

None yet

2 participants