OSD: add different config options for map bl caches

Signed-off-by: Samuel Just <samuel.just@dreamhost.com>

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index aefc622ec71d14a763a5b196d19258d06ab06bd5..a025bee89ddffaf3f79a81a9bc88ab3479f97a85 100644 (file)
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -273,6 +273,8 @@ OPTION(osd_pool_default_pg_num, OPT_INT, 8)
 OPTION(osd_pool_default_pgp_num, OPT_INT, 8)
 OPTION(osd_map_dedup, OPT_BOOL, true)
 OPTION(osd_map_cache_size, OPT_INT, 500)
+OPTION(osd_map_cache_bl_size, OPT_INT, 50)
+OPTION(osd_map_cache_bl_inc_size, OPT_INT, 100)
 OPTION(osd_map_message_max, OPT_INT, 100)  // max maps per MOSDMap message
 OPTION(osd_op_threads, OPT_INT, 2)    // 0 == no threading
 OPTION(osd_disk_threads, OPT_INT, 1)

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 6e3aa4bb257bddaf188f9b36aa905a91b016f976..26a156e22535a1d4f61305c68ce71e847028e3be 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -557,8 +557,8 @@ OSD::OSD(int id, Messenger *internal_messenger, Messenger *external_messenger,
   peer_map_epoch_lock("OSD::peer_map_epoch_lock"),
   map_cache_lock("OSD::map_cache_lock"),
   map_cache(g_conf->osd_map_cache_size),
-  map_bl_cache(g_conf->osd_map_cache_size),
-  map_bl_inc_cache(g_conf->osd_map_cache_size),
+  map_bl_cache(g_conf->osd_map_cache_bl_size),
+  map_bl_inc_cache(g_conf->osd_map_cache_bl_inc_size),
   outstanding_pg_stats(false),
   up_thru_wanted(0), up_thru_pending(0),
   pg_stat_queue_lock("OSD::pg_stat_queue_lock"),