Skip to content

Feature flags: Sync enabled feature flags differently on virgin node (backport #6791) #6826

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 1 commit into from
Jan 9, 2023
Merged

Feature flags: Sync enabled feature flags differently on virgin node (backport #6791) #6826

merged 1 commit into from
Jan 9, 2023

Conversation

@mergify
Copy link

@mergify mergify bot commented Jan 9, 2023

This is an automatic backport of pull request #6791 done by Mergify.
Cherry-pick of 2f301b4 has failed:

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

You are currently cherry-picking commit 2f301b4a38.
  (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/src/rabbit_feature_flags.erl
	modified:   deps/rabbit/src/rabbit_ff_controller.erl
	modified:   deps/rabbit/src/rabbit_mnesia.erl

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   deps/rabbit/test/feature_flags_v2_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

@mergify mergify bot added the conflicts label Jan 9, 2023
@dumbbell
rabbit_feature_flags: Sync enabled feature flags differently on virgi…
2a8676b 
…n node

If a virgin node starts as clustered (thanks to peer discovery), we need
to mark feature flags already enabled remotely as enabled locally too.

We can't do a regular cluster sync because remote nodes may have
required feature flags which are disabled locally on the virgin node.
Therefore, those nodes don't have the migration code for these feature
flags anymore and the feature flags' state can't be changed.

By doing this special sync, we allow a clustered virgin node to join a
cluster with remote nodes having required feature flags.

(cherry picked from commit 2f301b4)
@dumbbell dumbbell force-pushed the mergify/bp/v3.11.x/pr-6791 branch from cf86209 to 2a8676b Compare January 9, 2023 21:06
@dumbbell dumbbell removed the conflicts label Jan 9, 2023
@dumbbell dumbbell added this to the 3.11.7 milestone Jan 9, 2023
@dumbbell dumbbell merged commit 14c794b into v3.11.x Jan 9, 2023
@dumbbell dumbbell deleted the mergify/bp/v3.11.x/pr-6791 branch January 9, 2023 21:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@dumbbell dumbbell

Labels

None yet

Projects

None yet

Milestone

3.11.7

Development

Successfully merging this pull request may close these issues.

2 participants

@dumbbell