From: Joao Eduardo Luis Date: Tue, 4 Jun 2013 23:13:32 +0000 (+0100) Subject: mon: AuthMonitor: remove dead code to avoid confusion X-Git-Tag: v0.65~136^2^2~16 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f2177a4d596acdb44b3163bf0440afa3b514ecf2;p=ceph.git mon: AuthMonitor: remove dead code to avoid confusion AuthMonitor::election_finished() does nothing. PaxosService::election_finished() is the one being handled. Signed-off-by: Joao Eduardo Luis --- diff --git a/src/mon/AuthMonitor.cc b/src/mon/AuthMonitor.cc index baa95c9e11bb..e6a15ec832ab 100644 --- a/src/mon/AuthMonitor.cc +++ b/src/mon/AuthMonitor.cc @@ -315,12 +315,6 @@ bool AuthMonitor::prepare_update(PaxosServiceMessage *m) } } -void AuthMonitor::election_finished() -{ - dout(10) << "AuthMonitor::election_starting" << dendl; - last_allocated_id = 0; -} - uint64_t AuthMonitor::assign_global_id(MAuth *m, bool should_increase_max) { int total_mon = mon->monmap->size(); diff --git a/src/mon/AuthMonitor.h b/src/mon/AuthMonitor.h index 5d1422bbc4d7..3d305f5630cd 100644 --- a/src/mon/AuthMonitor.h +++ b/src/mon/AuthMonitor.h @@ -124,7 +124,6 @@ private: } void on_active(); - void election_finished(); bool should_propose(double& delay); void create_initial(); void update_from_paxos();