From: Sage Weil <sage@redhat.com>
Date: Fri, 8 Sep 2017 18:50:33 +0000 (-0400)
Subject: mon: drop pre-luminous support for mon metadata
X-Git-Tag: v13.0.1~861^2~12
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ebc33e86d0a56c6db6632600c206aa954f2683ac;p=ceph.git

mon: drop pre-luminous support for mon metadata

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 93fa0fad586..3088a2f518f 100644
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -1983,15 +1983,6 @@ void Monitor::lose_election(epoch_t epoch, set<int> &q, int l,
   logger->inc(l_mon_election_lose);
 
   finish_election();
-
-  if ((quorum_con_features & CEPH_FEATURE_MON_METADATA) &&
-      !HAVE_FEATURE(quorum_con_features, SERVER_LUMINOUS)) {
-    // for pre-luminous mons only
-    Metadata sys_info;
-    collect_metadata(&sys_info);
-    messenger->send_message(new MMonMetadata(sys_info),
-			    monmap->get_inst(get_leader()));
-  }
 }
 
 void Monitor::collect_metadata(Metadata *m)