mon/OSDMonitor: assume a minimum cluster size of 3

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 1010761e6ad392fcaa647ec0d1b3d071535adfb3)

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index a047b26f27ccfa619bbac9b3465363ffe6c395fc..a86df145a2a871e30006492d8ffd6bb0f5138149 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -5800,7 +5800,8 @@ int OSDMonitor::get_crush_rule(const string &rule_name,
 int OSDMonitor::check_pg_num(int64_t pool, int pg_num, int size, ostream *ss)
 {
   int64_t max_pgs_per_osd = g_conf->mon_pg_warn_max_per_osd;
-  int64_t max_pgs = max_pgs_per_osd * osdmap.get_num_in_osds();
+  int num_osds = MAX(osdmap.get_num_in_osds(), 3);   // assume min cluster size 3
+  int64_t max_pgs = max_pgs_per_osd * num_osds;
   int64_t projected = 0;
   if (pool < 0) {
     projected += pg_num * size;
@@ -5820,7 +5821,7 @@ int OSDMonitor::check_pg_num(int64_t pool, int pg_num, int size, ostream *ss)
        << " would mean " << projected
        << " total pgs, which exceeds max " << max_pgs
        << " (mon_pg_warn_max_per_osd " << max_pgs_per_osd
-       << " * num_in_osds " << osdmap.get_num_in_osds() << ")";
+       << " * num_in_osds " << num_osds << ")";
     return -ERANGE;
   }
   return 0;