osdmap: fix pg_num calculation when generating osdmap from conf

Base num_pg calculation on the number of osds, not the max osd id.

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

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index aaad4d8a02886e6d7f160c6c13afca4534132849..b24257f2d6c0616c0c7c68977e15660300036027 100644 (file)
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -1533,7 +1533,7 @@ void OSDMap::build_simple_from_conf(CephContext *cct, epoch_t e, uuid_d &fsid,
   const md_config_t *conf = cct->_conf;
 
   // count osds
-  int maxosd = 0;
+  int maxosd = 0, numosd = 0;
 
   vector<string> sections;
   conf->get_all_sections(sections);
@@ -1547,6 +1547,7 @@ void OSDMap::build_simple_from_conf(CephContext *cct, epoch_t e, uuid_d &fsid,
     if (*end != '\0')
       continue;
 
+    numosd++;
     if (o > maxosd)
       maxosd = o;
   }
@@ -1569,8 +1570,8 @@ void OSDMap::build_simple_from_conf(CephContext *cct, epoch_t e, uuid_d &fsid,
     pools[pool].size = cct->_conf->osd_pool_default_size;
     pools[pool].crush_ruleset = p->first;
     pools[pool].object_hash = CEPH_STR_HASH_RJENKINS;
-    pools[pool].set_pg_num((maxosd + 1) << pg_bits);
-    pools[pool].set_pgp_num((maxosd + 1) << pgp_bits);
+    pools[pool].set_pg_num((numosd + 1) << pg_bits);
+    pools[pool].set_pgp_num((numosd + 1) << pgp_bits);
     pools[pool].last_change = epoch;
     if (p->first == CEPH_DATA_RULE)
       pools[pool].crash_replay_interval = cct->_conf->osd_default_data_pool_replay_window;