mon/MgrMonitor: populate available_modules from promote_standby() #40078
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was done in the beacon path, where there is no active mgr and we get a new entrant, but not for this case where an existing standby is promoted to active. This fixes a problem during upgrade where a new (standby) mgr's modules have a new module option but it is not reflected immediately (not until the next beacon). Fixes: https://tracker.ceph.com/issues/49778 Signed-off-by: Sage Weil <sage@newdream.net>
If we are going active and the mons are pre-pacific, they may have the bug https://tracker.ceph.com/issues/49778 which prevents our modules metadata (including options) from being updated (until the next beacon). Wait a bit (6s by default, 3x the 2s mgr_tick_period) to let this happen. This allows us to upgrade from broken pre-pacific mons using cephadm, which may (if orig cluster is <15.2.5) immediately do a cephadm migration that relies on the mgr/cephadm/migration_current config option being present in the mon's mgrmap. Workaround for https://tracker.ceph.com/issues/49778 Signed-off-by: Sage Weil <sage@newdream.net>
|
jenkins test make check |
|
The first patch cherry-picked on top of 15.2.4 resolved a reproducer: https://pulpito.ceph.com/sage-2021-03-12_23:10:05-rados:cephadm:upgrade-master-distro-basic-smithi/ |
tchaikov
approved these changes
Mar 13, 2021
|
workaround patch applied to final version, upgrading from original 14.2.4 (to test the workaround): https://pulpito.ceph.com/sage-2021-03-13_15:52:31-rados:cephadm:upgrade-bug-49778-distro-basic-smithi/# |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This was done in the beacon path, where there is no active mgr and we
get a new entrant, but not for this case where an existing standby is
promoted to active.
This fixes a problem during upgrade where a new (standby) mgr's modules
have a new module option but it is not reflected immediately (not until
the next beacon).
Fixes: https://tracker.ceph.com/issues/49778
Checklist
Show available Jenkins commands
jenkins retest this pleasejenkins test classic perfjenkins test crimson perfjenkins test signedjenkins test make checkjenkins test make check arm64jenkins test submodulesjenkins test dashboardjenkins test apijenkins test docsjenkins render docsjenkins test ceph-volume alljenkins test ceph-volume tox