From 75aff0237169fc28ca323c7d8f3c4a5945982642 Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Thu, 1 Dec 2011 16:28:03 -0800 Subject: [PATCH] OSDMap: build_simple_from_conf pg_num should not be 0 with one osd Previously, pg_num would end up set to 0 if osd.0 is the only osd. Signed-off-by: Samuel Just --- src/osd/OSDMap.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc index 388a64da17822..ed2c3ea58c797 100644 --- a/src/osd/OSDMap.cc +++ b/src/osd/OSDMap.cc @@ -1012,8 +1012,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].pg_num = maxosd << pg_bits; - pools[pool].pgp_num = maxosd << pgp_bits; + pools[pool].pg_num = (maxosd + 1) << pg_bits; + pools[pool].pgp_num = (maxosd + 1) << pgp_bits; pools[pool].lpg_num = lpg_bits ? (1 << (lpg_bits-1)) : 0; pools[pool].lpgp_num = lpg_bits ? (1 << (lpg_bits-1)) : 0; pools[pool].last_change = epoch; -- 2.39.5