summaryrefslogtreecommitdiffstats
path: root/src/mon
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2014-03-14 16:30:04 +0100
committerSage Weil <sage@inktank.com>2014-03-14 16:30:04 +0100
commit5676d6e5beb6584fa000db5a9fb517d4301b608c (patch)
tree1b06ebf7484d185630fef4356d7c0b499f94750a /src/mon
parentdoc/release-notes: 0.78 draft nodes; firefly draft notes (diff)
parentMerge pull request #1450 from ceph/wip-7641 (diff)
downloadceph-5676d6e5beb6584fa000db5a9fb517d4301b608c.tar.xz
ceph-5676d6e5beb6584fa000db5a9fb517d4301b608c.zip
Merge remote-tracking branch 'gh/firefly'
Diffstat (limited to 'src/mon')
-rw-r--r--src/mon/OSDMonitor.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 250e90b6489..de6bfc1e065 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -3064,6 +3064,12 @@ int OSDMonitor::prepare_new_pool(string& name, uint64_t auid, int crush_ruleset,
pi->auid = auid;
pi->properties = properties_map;
pi->stripe_width = stripe_width;
+ pi->cache_target_dirty_ratio_micro =
+ 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;
}