mon/OSDMonitor: allow osd_pool_default_pgp_num to be 0

If it's 0, use the pg_num value.  This lets you adjust the
osd_pool_default_pg_num option without also adjusting the pgp_num one.

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

diff --git a/src/common/options.cc b/src/common/options.cc
index db52824a4e8d147f75b1993ac5c9f374fd61c84f..b9156fe674ae072ba43d5c9165f04a8897cdde8c 100644 (file)
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -2400,8 +2400,8 @@ std::vector<Option> get_global_options() {
     .add_service("mon"),
 
     Option("osd_pool_default_pgp_num", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
-    .set_default(8)
-    .set_description("number of PGs for placement purposes. Should be equal to pg_num")
+    .set_default(0)
+    .set_description("number of PGs for placement purposes (0 to match pg_num)")
     .add_see_also("osd_pool_default_pg_num")
     .set_flag(Option::FLAG_RUNTIME)
     .add_service("mon"),

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 9f7f176aabe212148f0f12773fb681c5795b0e0c..e9879b1d4ebfdf5ffbbea6f0f7bed596c2eecd64 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -6686,6 +6686,8 @@ int OSDMonitor::prepare_new_pool(string& name,
     pg_num = g_conf().get_val<uint64_t>("osd_pool_default_pg_num");
   if (pgp_num == 0)
     pgp_num = g_conf().get_val<uint64_t>("osd_pool_default_pgp_num");
+  if (!pgp_num)
+    pgp_num = pg_num;
   if (pg_num > g_conf().get_val<uint64_t>("mon_max_pool_pg_num")) {
     *ss << "'pg_num' must be greater than 0 and less than or equal to "
         << g_conf().get_val<uint64_t>("mon_max_pool_pg_num")