From 2eb1bb2149ff9d194a30b162fd0ec5fc02003bf6 Mon Sep 17 00:00:00 2001 From: Joao Eduardo Luis Date: Tue, 23 Jul 2013 16:21:46 +0100 Subject: mon: OSDMonitor: get rid of encode_full() as we don't use it. We have delegated this to encode_trim_extra() since 7fb3804fb860dcd0340dd3f7c39eec4315f8e4b6 -- no need to keep this code around. Signed-off-by: Joao Eduardo Luis --- src/mon/OSDMonitor.cc | 11 ----------- src/mon/OSDMonitor.h | 6 +++++- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 6184f2afe72..bad8caa1436 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -504,17 +504,6 @@ void OSDMonitor::encode_pending(MonitorDBStore::Transaction *t) put_last_committed(t, pending_inc.epoch); } -void OSDMonitor::encode_full(MonitorDBStore::Transaction *t) -{ - dout(10) << __func__ << " osdmap e " << osdmap.epoch << dendl; - assert(get_version() == osdmap.epoch); - - bufferlist osdmap_bl; - osdmap.encode(osdmap_bl); - put_version_full(t, osdmap.epoch, osdmap_bl); - put_version_latest_full(t, osdmap.epoch); -} - void OSDMonitor::share_map_with_random_osd() { if (osdmap.get_num_up_osds() == 0) { diff --git a/src/mon/OSDMonitor.h b/src/mon/OSDMonitor.h index 98fb5954ae5..af76b2ef39b 100644 --- a/src/mon/OSDMonitor.h +++ b/src/mon/OSDMonitor.h @@ -148,9 +148,13 @@ private: void update_from_paxos(bool *need_bootstrap); void create_pending(); // prepare a new pending void encode_pending(MonitorDBStore::Transaction *t); - virtual void encode_full(MonitorDBStore::Transaction *t); void on_active(); + /** + * we don't let paxosservice stash our full maps, so we don't need this + * function at all. + */ + virtual void encode_full(MonitorDBStore::Transaction *t) { } /** * do not let paxosservice periodically stash full osdmaps, or we will break our * locally-managed full maps. (update_from_paxos loads the latest and writes them -- cgit v1.2.1