]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
mon: osd: switch crush_bucket_mandatory_member to be CRUSH_ITEM_NONE-based
authorGreg Farnum <gfarnum@redhat.com>
Thu, 16 Jul 2020 03:08:35 +0000 (03:08 +0000)
committerGreg Farnum <gfarnum@redhat.com>
Tue, 21 Jul 2020 17:59:15 +0000 (17:59 +0000)
commit613b2b19b9284894dcddef2c974cd26e41fb3384
tree7356af9ea6adf04bfa6f3daf60584f7062bd19fd
parent97fbd19ccd02046cb643239ac3c6fcb8404b4445
mon: osd: switch crush_bucket_mandatory_member to be CRUSH_ITEM_NONE-based

Previously we compared it to zero, but we could technically want to require
osd.0 as a member, maybe? In any case we have a "DNE" indicator
in CRUSH_ITEM_NONE, so use it.

Also, for osd_types.h, declare a pg_pool_t::pg_CRUSH_ITEM_NONE to use,
since apparently we can't import crush.h there and hard-coding it is bad.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
src/mon/OSDMonitor.cc
src/osd/PeeringState.cc
src/osd/osd_types.cc
src/osd/osd_types.h
src/osdc/Objecter.h