mon: default min_size to size-size/2 if min_size default is 0

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

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 0316a906fa605570373fe6f2cf7799872d3fc2d6..40d12de9fd5d72d78d5c5f975800cdc4065c6e9d 100644 (file)
--- 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