paxosservice: remove unused committed() callback

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

diff --git a/src/mon/AuthMonitor.cc b/src/mon/AuthMonitor.cc
index 1dd8b7314aa00ce94c965722a85e0294e5571df2..dac30353c87ff82a4eddc22351c4bddcd0c8938a 100644 (file)
--- a/src/mon/AuthMonitor.cc
+++ b/src/mon/AuthMonitor.cc
@@ -260,11 +260,6 @@ bool AuthMonitor::prepare_update(PaxosServiceMessage *m)
   }
 }
 
-void AuthMonitor::committed()
-{
-
-}
-
 void AuthMonitor::election_finished()
 {
   dout(10) << "AuthMonitor::election_starting" << dendl;

diff --git a/src/mon/AuthMonitor.h b/src/mon/AuthMonitor.h
index d60de0fa3564c4fcfb63470f4b4fa2cd6ff314cf..056484540b4a465e29911e784b04d38034a6f0ac 100644 (file)
--- a/src/mon/AuthMonitor.h
+++ b/src/mon/AuthMonitor.h
@@ -101,8 +101,6 @@ private:
   uint64_t assign_global_id(MAuth *m, bool should_increase_max);
   void encode_pending(bufferlist &bl);  // propose pending update to peers
 
-  void committed();
-
   bool preprocess_query(PaxosServiceMessage *m);  // true if processed.
   bool prepare_update(PaxosServiceMessage *m);
 

diff --git a/src/mon/LogMonitor.cc b/src/mon/LogMonitor.cc
index 1e305d342421c8359ad9f34a8836ef4b47822f6c..2122aff362665e886f0451f1f6161f45c1fba2e5 100644 (file)
--- a/src/mon/LogMonitor.cc
+++ b/src/mon/LogMonitor.cc
@@ -226,11 +226,6 @@ bool LogMonitor::prepare_update(PaxosServiceMessage *m)
   }
 }
 
-void LogMonitor::committed()
-{
-
-}
-
 bool LogMonitor::preprocess_log(MLog *m)
 {
   dout(10) << "preprocess_log " << *m << " from " << m->get_orig_source() << dendl;

diff --git a/src/mon/LogMonitor.h b/src/mon/LogMonitor.h
index 20367c08672aca8bd72ac12f724a8457d89d40e8..da4c8d4cedadbc03b64480157dcbc1af06c10e47 100644 (file)
--- a/src/mon/LogMonitor.h
+++ b/src/mon/LogMonitor.h
@@ -38,8 +38,6 @@ private:
   void create_pending();  // prepare a new pending
   void encode_pending(bufferlist &bl);  // propose pending update to peers
 
-  void committed();
-
   bool preprocess_query(PaxosServiceMessage *m);  // true if processed.
   bool prepare_update(PaxosServiceMessage *m);
 

diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc
index 160ed50bd06d20192acb60e29073226fc5f10fec..57043d0f9e83410db3bd11510bee1d38c18e7cb2 100644 (file)
--- a/src/mon/MDSMonitor.cc
+++ b/src/mon/MDSMonitor.cc
@@ -472,11 +472,6 @@ void MDSMonitor::_updated(MMDSBeacon *m)
   m->put();
 }
 
-
-void MDSMonitor::committed()
-{
-}
-
 void MDSMonitor::on_active()
 {
   tick();

diff --git a/src/mon/MDSMonitor.h b/src/mon/MDSMonitor.h
index f970329c8f0e257acc3897640b3736c0a016437e..a315231803c29889adcfcf2f4b653944b89229f8 100644 (file)
--- a/src/mon/MDSMonitor.h
+++ b/src/mon/MDSMonitor.h
@@ -77,7 +77,6 @@ class MDSMonitor : public PaxosService {
   bool prepare_update(PaxosServiceMessage *m);
   bool should_propose(double& delay);
 
-  void committed();
   void on_active();
 
   void _note_beacon(class MMDSBeacon *m);

diff --git a/src/mon/MonmapMonitor.cc b/src/mon/MonmapMonitor.cc
index f50766c369c92829aa939701c1bd5f60eeeb4805..f5d25e6201cc5527ff233ea9b79dd5b0f3534ede 100644 (file)
--- a/src/mon/MonmapMonitor.cc
+++ b/src/mon/MonmapMonitor.cc
@@ -367,11 +367,6 @@ bool MonmapMonitor::should_propose(double& delay)
   return true;
 }
 
-void MonmapMonitor::committed()
-{
-  //Nothing useful to do here.
-}
-
 void MonmapMonitor::tick()
 {
   update_from_paxos();

diff --git a/src/mon/MonmapMonitor.h b/src/mon/MonmapMonitor.h
index 0df458cae415ee5b58619ec7a54d345a49214de0..0393de9dff0ec17d14ef64fdaa8efd5c6b110680 100644 (file)
--- a/src/mon/MonmapMonitor.h
+++ b/src/mon/MonmapMonitor.h
@@ -69,8 +69,6 @@ class MonmapMonitor : public PaxosService {
    */
   bool should_propose(double& delay);
 
-  void committed();
-
   void tick();
 
  private:

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index c71d502d17f5faf67186d67fd6f269a74db73207..b29473fc7d83c5c025b495141815da04ef90eaae 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -296,10 +296,6 @@ void OSDMonitor::encode_pending(bufferlist &bl)
 }
 
 
-void OSDMonitor::committed()
-{
-}
-
 void OSDMonitor::share_map_with_random_osd()
 {
   // tell any osd

diff --git a/src/mon/OSDMonitor.h b/src/mon/OSDMonitor.h
index c7d17459f11c61da09539b308d17a76cc06d0a30..294214885ea3c688c02c8fdb1b3bb0cc499128fd 100644 (file)
--- a/src/mon/OSDMonitor.h
+++ b/src/mon/OSDMonitor.h
@@ -57,7 +57,6 @@ private:
   void create_pending();  // prepare a new pending
   void encode_pending(bufferlist &bl);
 
-  void committed();
   void share_map_with_random_osd();
 
   void handle_query(PaxosServiceMessage *m);

diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc
index 1a21a291a04228aee927bb79d08399ae1a2cfb8f..8f61c7c36e8d25220435785fd64766afc70153db 100644 (file)
--- a/src/mon/PGMonitor.cc
+++ b/src/mon/PGMonitor.cc
@@ -258,11 +258,6 @@ bool PGMonitor::prepare_update(PaxosServiceMessage *m)
   }
 }
 
-void PGMonitor::committed()
-{
-
-}
-
 void PGMonitor::handle_statfs(MStatfs *statfs)
 {
   // check caps

diff --git a/src/mon/PGMonitor.h b/src/mon/PGMonitor.h
index a5a4d63e20eea57021a68c63ae05e2dec0f623c3..a9514feff34d1b3f78a2f4b5cce608e39f3d18f2 100644 (file)
--- a/src/mon/PGMonitor.h
+++ b/src/mon/PGMonitor.h
@@ -52,8 +52,6 @@ private:
   void create_pending();  // prepare a new pending
   void encode_pending(bufferlist &bl);  // propose pending update to peers
 
-  void committed();
-
   bool preprocess_query(PaxosServiceMessage *m);  // true if processed.
   bool prepare_update(PaxosServiceMessage *m);
 

diff --git a/src/mon/PaxosService.cc b/src/mon/PaxosService.cc
index 3d6ceef869cf45632834a387ef8cf2cca1901461..d7133df43fafb06f5158c33112ecd5dab1f7c015 100644 (file)
--- a/src/mon/PaxosService.cc
+++ b/src/mon/PaxosService.cc
@@ -115,8 +115,6 @@ void PaxosService::_commit()
       create_pending();
       have_pending = true;
     }
-
-    committed();
   }
 }
 

diff --git a/src/mon/PaxosService.h b/src/mon/PaxosService.h
index a0cd66ee6b38b8213632fe9c2356d3b1a77a18df..de2b9d39e9351a31970c050e92bf53043ae337cc 100644 (file)
--- a/src/mon/PaxosService.h
+++ b/src/mon/PaxosService.h
@@ -165,8 +165,6 @@ public:
    */
   virtual void on_restart() { }
 
-  virtual void committed() = 0;            // [leader] called after a proposed value commits
-
   virtual void tick() {}
 
   virtual enum health_status_t get_health(std::ostream& os) const { return HEALTH_OK; }