RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-31 23:44:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

osdmap: fix pg_num calculation when generating osdmap from conf

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

Fixes: #2918
Signed-off-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Sage Weil 2012-08-14 16:06:54 -07:00
parent efe913b886
commit 1a5e12ec5f
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/osd/OSDMap.cc
View File

@ -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;