osd: add tunables for cache_min_{flush,evict}_age

Why not.

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index e918c3bf0f3f008bbaacb3046c2e96ef26602a17..0f07fa05934134ce1791eadf543a9561bfc0b2a9 100644 (file)
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -432,6 +432,8 @@ OPTION(osd_pool_default_flag_hashpspool, OPT_BOOL, true)   // use new pg hashing
 OPTION(osd_pool_default_hit_set_bloom_fpp, OPT_FLOAT, .05)
 OPTION(osd_pool_default_cache_target_dirty_ratio, OPT_FLOAT, .4)
 OPTION(osd_pool_default_cache_target_full_ratio, OPT_FLOAT, .8)
+OPTION(osd_pool_default_cache_min_flush_age, OPT_INT, 0)  // seconds
+OPTION(osd_pool_default_cache_min_evict_age, OPT_INT, 0)  // seconds
 OPTION(osd_hit_set_min_size, OPT_INT, 1000)  // min target size for a HitSet
 OPTION(osd_hit_set_namespace, OPT_STR, ".ceph-internal") // rados namespace for hit_set tracking
 

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 5af8e5355ccce7e720fced0c562de5c0c019435f..b03144144a6fdd87b7c1ef8209e9ca9ccc862c9f 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -3038,6 +3038,8 @@ int OSDMonitor::prepare_new_pool(string& name, uint64_t auid, int crush_ruleset,
     g_conf->osd_pool_default_cache_target_dirty_ratio * 1000000;
   pi->cache_target_full_ratio_micro =
     g_conf->osd_pool_default_cache_target_full_ratio * 1000000;
+  pi->cache_min_flush_age = g_conf->osd_pool_default_cache_min_flush_age;
+  pi->cache_min_evict_age = g_conf->osd_pool_default_cache_min_evict_age;
   pending_inc.new_pool_names[pool] = name;
   return 0;
 }