From 091ef61ff8027b7b50469e64d02ccd6f87d2cc46 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 9 Jul 2019 13:38:14 -0500 Subject: [PATCH] osd: send MOSDMarkMeDead when we are marked down Signed-off-by: Sage Weil --- src/osd/OSD.cc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index d58c628efcf36..7219b80f20740 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -71,6 +71,7 @@ #include "messages/MOSDPing.h" #include "messages/MOSDFailure.h" #include "messages/MOSDMarkMeDown.h" +#include "messages/MOSDMarkMeDead.h" #include "messages/MOSDFull.h" #include "messages/MOSDOp.h" #include "messages/MOSDOpReply.h" @@ -8024,6 +8025,14 @@ void OSD::_committed_osd_maps(epoch_t first, epoch_t last, MOSDMap *m) << " wrongly marked me down at e" << osdmap->get_down_at(whoami); } + if (monc->monmap.min_mon_release >= ceph_release_t::octopus) { + // note that this is best-effort... + monc->send_mon_message( + new MOSDMarkMeDead( + monc->get_fsid(), + whoami, + osdmap->get_epoch())); + } } else if (!osdmap->get_addrs(whoami).legacy_equals( client_messenger->get_myaddrs())) { clog->error() << "map e" << osdmap->get_epoch() -- 2.39.5