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

Dynamic Shovels: support old (pre-3.13.0, 3.12.8) and new supervisor child ID formats (backport #9909) #9919

Merged
merged 3 commits into from
Nov 15, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 14, 2023

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

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

You are currently cherry-picking commit 2ce0307641.
  (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:   deps/rabbitmq_shovel/src/rabbit_shovel_dyn_worker_sup_sup.erl

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/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

During a rolling upgrade, all cluster nodes collectively
may (and usually will, due to Shovel migration during node restarts)
contain mirrored_supervisor children with IDs that use two different
parameters (see referenced commits below).

The old format should not trip up node startup, so new
nodes must accept it in a few places, and try to use
these older values during dynamic Shovel spec cleanup.

References ccc22cb, 5f0981c, #9785.

See #9894.

(cherry picked from commit 2ce0307)

# Conflicts:
#	deps/rabbitmq_shovel/src/rabbit_shovel_dyn_worker_sup_sup.erl
So that they do not make it to Khepri.

(cherry picked from commit 28741cd)
@michaelklishin
Copy link
Member

@gomoripeti this backport PR is ready for another round of QA.

@michaelklishin
Copy link
Member

michaelklishin commented Nov 15, 2023

According to my tests that performed a rolling upgrade of three cluster nodes from 3.12.6 to this version of 3.12, the exception is gone and Shovels function as expected.

@michaelklishin michaelklishin merged commit da160cf into v3.12.x Nov 15, 2023
@michaelklishin michaelklishin deleted the mergify/bp/v3.12.x/pr-9909 branch November 15, 2023 04:46
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.

1 participant