diff options
author | Sage Weil <sage@newdream.net> | 2011-11-18 10:05:35 -0800 |
---|---|---|
committer | Sage Weil <sage.weil@dreamhost.com> | 2011-11-19 14:30:31 -0800 |
commit | 10fed791e9e1860423d671eadad375cfd6ccd4e8 (patch) | |
tree | b99100e7c4a1d0a26a3c523426a0976c5e4664b1 | |
parent | b521710f1002fe7a2dbd015ba4427ea2b09aad4c (diff) | |
download | ceph-10fed791e9e1860423d671eadad375cfd6ccd4e8.tar.gz |
paxosservice: remove unused committed() callback
Signed-off-by: Sage Weil <sage@newdream.net>
-rw-r--r-- | src/mon/AuthMonitor.cc | 5 | ||||
-rw-r--r-- | src/mon/AuthMonitor.h | 2 | ||||
-rw-r--r-- | src/mon/LogMonitor.cc | 5 | ||||
-rw-r--r-- | src/mon/LogMonitor.h | 2 | ||||
-rw-r--r-- | src/mon/MDSMonitor.cc | 5 | ||||
-rw-r--r-- | src/mon/MDSMonitor.h | 1 | ||||
-rw-r--r-- | src/mon/MonmapMonitor.cc | 5 | ||||
-rw-r--r-- | src/mon/MonmapMonitor.h | 2 | ||||
-rw-r--r-- | src/mon/OSDMonitor.cc | 4 | ||||
-rw-r--r-- | src/mon/OSDMonitor.h | 1 | ||||
-rw-r--r-- | src/mon/PGMonitor.cc | 5 | ||||
-rw-r--r-- | src/mon/PGMonitor.h | 2 | ||||
-rw-r--r-- | src/mon/PaxosService.cc | 2 | ||||
-rw-r--r-- | src/mon/PaxosService.h | 2 |
14 files changed, 0 insertions, 43 deletions
diff --git a/src/mon/AuthMonitor.cc b/src/mon/AuthMonitor.cc index 1dd8b7314aa..dac30353c87 100644 --- 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 d60de0fa356..056484540b4 100644 --- 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 1e305d34242..2122aff3626 100644 --- 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 20367c08672..da4c8d4ceda 100644 --- 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 160ed50bd06..57043d0f9e8 100644 --- 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 f970329c8f0..a315231803c 100644 --- 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 f50766c369c..f5d25e6201c 100644 --- 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 0df458cae41..0393de9dff0 100644 --- 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 c71d502d17f..b29473fc7d8 100644 --- 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 c7d17459f11..294214885ea 100644 --- 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 1a21a291a04..8f61c7c36e8 100644 --- 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 a5a4d63e20e..a9514feff34 100644 --- 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 3d6ceef869c..d7133df43fa 100644 --- 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 a0cd66ee6b3..de2b9d39e93 100644 --- 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; } |