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

mon: add MMonHealth back #20528

Merged
merged 1 commit into from Feb 28, 2018

Conversation

Projects
None yet
4 participants
@tchaikov
Copy link
Contributor

commented Feb 22, 2018

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

@tchaikov tchaikov requested a review from liewegas Feb 22, 2018

@xiexingguo

This comment has been minimized.

Copy link
Member

commented Feb 22, 2018

The failure seems real:-)

@tchaikov tchaikov force-pushed the tchaikov:wip-22462 branch 2 times, most recently from 27a65d1 to be74d66 Feb 22, 2018

@jecluis

This comment has been minimized.

Copy link
Member

commented Feb 22, 2018

Just to confirm, the objective here is to gracefully simply drop MMonHealth messages during the upgrade path from before-mimic to mimic, right?

@@ -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:

This comment has been minimized.

Copy link
@jecluis

jecluis Feb 22, 2018

Member

you'll also need to handle the message in Monitor::dispatch_op(), to redirect it to the HealthMonitor.

@tchaikov

This comment has been minimized.

Copy link
Contributor Author

commented Feb 22, 2018

Just to confirm, the objective here is to gracefully simply drop MMonHealth messages during the upgrade path from before-mimic to mimic, right?

@jecluis exactly.

mon: add MMonHealth back
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>
@tchaikov

This comment has been minimized.

Copy link
Contributor Author

commented Feb 22, 2018

@jecluis fixed and repushed. the message is now dropped in Monitor::dispatch_op() in the latest change.

@tchaikov tchaikov force-pushed the tchaikov:wip-22462 branch from be74d66 to 5ac6335 Feb 22, 2018

@jecluis
Copy link
Member

left a comment

lgtm

@tchaikov tchaikov added the needs-qa label Feb 22, 2018

@tchaikov tchaikov merged commit 3b77d35 into ceph:master Feb 28, 2018

5 checks passed

Docs: build check OK - docs built
Details
Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
make check make check succeeded
Details
make check (arm64) make check succeeded
Details

@tchaikov tchaikov deleted the tchaikov:wip-22462 branch Feb 28, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.