mon: eliminate PaxosService::init()

update_from_paxos() is sufficient

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/mon/AuthMonitor.cc b/src/mon/AuthMonitor.cc
index ff9db8d4b26e921fc1c30dac9d62d19e908f0370..a0b89a925138b1588c3ee733fac93cfb47387b87 100644 (file)
--- a/src/mon/AuthMonitor.cc
+++ b/src/mon/AuthMonitor.cc
@@ -194,36 +194,6 @@ bool AuthMonitor::should_propose(double& delay)
   return (pending_auth.size() > 0);
 }
 
-void AuthMonitor::init()
-{
-  version_t paxosv = paxos->get_version();
-  version_t keys_ver = mon->key_server.get_ver();
-
-  dout(10) << "AuthMonitor::init() paxosv=" << paxosv << dendl;
-
-  if (paxosv == keys_ver) return;
-  assert(paxosv >= keys_ver);
-
-  if (keys_ver == 0 && paxosv > 1) {
-    // startup: just load latest full map
-    bufferlist latest;
-    version_t v = paxos->get_latest(latest);
-    if (v) {
-      dout(10) << "AuthMonitor::init() startup: loading summary e" << v << dendl;
-      bufferlist::iterator p = latest.begin();
-      __u8 v;
-      ::decode(v, p);
-      ::decode(max_global_id, p);
-      ::decode(mon->key_server, p);
-    }
-  }
-
-  last_allocated_id = max_global_id;
-
-  /* should only happen on the first time */
-  update_from_paxos();
-}
-
 void AuthMonitor::create_pending()
 {
   pending_auth.clear();

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 8b2721bc36e95d6ee5ab0c4531fe921d1141556a..22a72d0b3e602bae36fddd6486b0f4426a559547 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -179,7 +179,7 @@ void Monitor::init()
     (*p)->init();
 
   for (vector<PaxosService*>::iterator ps = paxos_service.begin(); ps != paxos_service.end(); ps++)
-    (*ps)->init();
+    (*ps)->update_from_paxos();
 
   // i'm ready!
   messenger->add_dispatcher_tail(this);

diff --git a/src/mon/PaxosService.h b/src/mon/PaxosService.h
index d5841f1f9bf76574a09fe5a4c8e7812bbde595c0..e76658ba321d87ad71f1a38d9682546c610a5dde 100644 (file)
--- a/src/mon/PaxosService.h
+++ b/src/mon/PaxosService.h
@@ -169,8 +169,6 @@ public:
 
   virtual void tick() {}
 
-  virtual void init() {}
-
   virtual enum health_status_t get_health(std::ostream& os) const { return HEALTH_OK; }
 
 };