mon: add MMonHealth back #20528
Merged
mon: add MMonHealth back #20528
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
|
The failure seems real:-) |
tchaikov
force-pushed
the
wip-22462
branch
2 times, most recently
from
27a65d1
to
be74d66
Compare
|
Just to confirm, the objective here is to gracefully simply drop MMonHealth messages during the upgrade path from before-mimic to mimic, right? |
jecluis
requested changes
Feb 22, 2018
src/mon/HealthMonitor.cc
Outdated
| @@ -159,6 +160,10 @@ bool HealthMonitor::prepare_update(MonOpRequestRef op) | |||
| dout(7) << "prepare_update " << *m | |||
| << " from " << m->get_orig_source_inst() << dendl; | |||
| switch (m->get_type()) { | |||
| case MSG_MON_HEALTH: | |||
There was a problem hiding this comment.
you'll also need to handle the message in Monitor::dispatch_op(), to redirect it to the HealthMonitor.
@jecluis exactly. |
This partially reverts commit 7b4a741. we need to at least decode MMonHealth sent from luminous monitors in mimic. and in luminous, we could drop the support of this message, if we can only upgrade from mimic. Fixes: http://tracker.ceph.com/issues/22462 Signed-off-by: Kefu Chai <kchai@redhat.com>
|
@jecluis fixed and repushed. the message is now dropped in |
liewegas
approved these changes
Feb 22, 2018
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 partially reverts commit 7b4a741.
we need to at least decode MMonHealth sent from luminous monitors in
mimic. and in luminous, we could drop the support of this message, if we
can only upgrade from mimic.
Fixes: http://tracker.ceph.com/issues/22462
Signed-off-by: Kefu Chai kchai@redhat.com