From 56071cc1bcd523bd099efd77b7f813629e09e210 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sat, 24 Sep 2011 15:19:31 -0700 Subject: [PATCH] osd: drop map_cache_keep_from The purpose here was to avoid trimming cached maps prior to what we have on disk. However, now that we have the map_bl cache, this isn't needed: anything after that epoch will come out of that cache. Also, it was broken anyway--the value was never read. So clean it out! Signed-off-by: Sage Weil --- src/osd/OSD.cc | 12 ++---------- src/osd/OSD.h | 2 -- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index e0dfd143508cb..3fe7ee7e55751 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -541,7 +541,7 @@ OSD::OSD(int id, Messenger *internal_messenger, Messenger *external_messenger, osdmap(NULL), map_lock("OSD::map_lock"), peer_map_epoch_lock("OSD::peer_map_epoch_lock"), - map_cache_lock("OSD::map_cache_lock"), map_cache_keep_from(0), + map_cache_lock("OSD::map_cache_lock"), up_thru_wanted(0), up_thru_pending(0), pg_stat_queue_lock("OSD::pg_stat_queue_lock"), osd_stat_updated(false), @@ -3294,7 +3294,6 @@ void OSD::handle_osd_map(MOSDMap *m) // everything through current epoch now on disk; keep anything after // that in cache - keep_map_from(osdmap->get_epoch()+1); trim_map_bl_cache(osdmap->get_epoch()+1); trim_map_cache(0); @@ -3584,13 +3583,6 @@ OSDMap *OSD::get_map(epoch_t epoch) return map; } -void OSD::keep_map_from(epoch_t from) -{ - Mutex::Locker l(map_cache_lock); - dout(10) << "keep_map_from " << from << dendl; - map_cache_keep_from = from; -} - void OSD::trim_map_bl_cache(epoch_t oldest) { Mutex::Locker l(map_cache_lock); @@ -3604,7 +3596,7 @@ void OSD::trim_map_bl_cache(epoch_t oldest) void OSD::trim_map_cache(epoch_t oldest) { Mutex::Locker l(map_cache_lock); - dout(10) << "trim_map_cache up to MIN(" << oldest << "," << map_cache_keep_from << ")" << dendl; + dout(10) << "trim_map_cache prior to " << oldest << dendl; while (!map_cache.empty() && (map_cache.begin()->first < oldest || (int)map_cache.size() > g_conf->osd_map_cache_max)) { diff --git a/src/osd/OSD.h b/src/osd/OSD.h index 3c177384fe869..014a25c6f1332 100644 --- a/src/osd/OSD.h +++ b/src/osd/OSD.h @@ -396,7 +396,6 @@ private: map map_inc_bl; map map_bl; Mutex map_cache_lock; - epoch_t map_cache_keep_from; OSDMap* get_map(epoch_t e); void add_map(OSDMap *o); @@ -405,7 +404,6 @@ private: void trim_map_cache(epoch_t oldest); void trim_map_bl_cache(epoch_t oldest); void clear_map_cache(); - void keep_map_from(epoch_t from); bool get_map_bl(epoch_t e, bufferlist& bl); bool get_inc_map_bl(epoch_t e, bufferlist& bl); -- 2.39.5