From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Tue, 4 Jul 2017 11:27:49 +0000 (+0800)
Subject: mon/Monitor: kill get_paxos_service_by_name()
X-Git-Tag: v12.1.1~101^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=def1b1d78f2859a1df9de83334a3a585ff1f0aa3;p=ceph.git

mon/Monitor: kill get_paxos_service_by_name()

(1) The new PAXOS_MGRSTAT is excluded and may cause
    problems
(2) This method has no consumer

Considering (2), it's better to be removed than to be fixed...

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
---

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 1e86040591a..66a7244bdbe 100644
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -227,27 +227,6 @@ Monitor::Monitor(CephContext* cct_, string nm, MonitorDBStore *s,
   pgservice = mgrstatmon()->get_pg_stat_service();
 }
 
-PaxosService *Monitor::get_paxos_service_by_name(const string& name)
-{
-  if (name == "mdsmap")
-    return paxos_service[PAXOS_MDSMAP];
-  if (name == "monmap")
-    return paxos_service[PAXOS_MONMAP];
-  if (name == "osdmap")
-    return paxos_service[PAXOS_OSDMAP];
-  if (name == "pgmap")
-    return paxos_service[PAXOS_PGMAP];
-  if (name == "logm")
-    return paxos_service[PAXOS_LOG];
-  if (name == "auth")
-    return paxos_service[PAXOS_AUTH];
-  if (name == "mgr")
-    return paxos_service[PAXOS_MGR];
-
-  assert(0 == "given name does not match known paxos service");
-  return NULL;
-}
-
 Monitor::~Monitor()
 {
   for (vector<PaxosService*>::iterator p = paxos_service.begin(); p != paxos_service.end(); ++p)
diff --git a/src/mon/Monitor.h b/src/mon/Monitor.h
index 534eb4a6354..925f8bb86ab 100644
--- a/src/mon/Monitor.h
+++ b/src/mon/Monitor.h
@@ -615,8 +615,6 @@ public:
    */
   vector<PaxosService*> paxos_service;
 
-  PaxosService *get_paxos_service_by_name(const string& name);
-
   class PGMonitor *pgmon() {
     return (class PGMonitor *)paxos_service[PAXOS_PGMAP];
   }