summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2012-11-13 15:11:42 -0800
committerSage Weil <sage@inktank.com>2012-11-13 15:12:33 -0800
commit1d00f3aa6734e86d5c036624564ad576f3b76290 (patch)
tree5c6fdb50607426890bc93f8e800cd7fde1cdd345
parent9d979d767d40db0cae97bb8641772052940013e8 (diff)
downloadceph-1d00f3aa6734e86d5c036624564ad576f3b76290.tar.gz
mon: default min_size to size-size/2 if min_size default is 0
Signed-off-by: Sage Weil <sage@inktank.com>
-rw-r--r--src/mon/OSDMonitor.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 0316a906fa6..40d12de9fd5 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -1892,8 +1892,11 @@ int OSDMonitor::prepare_new_pool(string& name, uint64_t auid, int crush_rule,
pending_inc.new_pools[pool].type = pg_pool_t::TYPE_REP;
pending_inc.new_pools[pool].size = g_conf->osd_pool_default_size;
- pending_inc.new_pools[pool].min_size =
- g_conf->osd_pool_default_min_size;
+ if (g_conf->osd_pool_default_min_size)
+ pending_inc.new_pools[pool].min_size = MIN(g_conf->osd_pool_default_size,
+ g_conf->osd_pool_default_min_size);
+ else
+ pending_inc.new_pools[pool].min_size = g_conf->osd_pool_default_size - g_conf->osd_pool_default_size/2;
if (crush_rule >= 0)
pending_inc.new_pools[pool].crush_ruleset = crush_rule;
else