]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
osd: build_simple creates a single rule
authorLoic Dachary <loic@dachary.org>
Wed, 25 Dec 2013 12:19:56 +0000 (13:19 +0100)
committerLoic Dachary <loic@dachary.org>
Thu, 26 Dec 2013 23:13:47 +0000 (00:13 +0100)
commita10fc025d77406b74a220ef44621525cd3c79b80
tree0cf85804eb0efa25be0fa206cc32fe0bc6a9de49
parent15b695937be35d666c6e156d18e1cb56fbf0c4a6
osd: build_simple creates a single rule

The three rules created by build_simple are identical. They are replaced
by a single rule named replicated_rule which is set to be used by the
data, rbd and metadata pools.

Instead of hardcoding the ruleset number to zero, it is read from
osd_pool_default_crush_ruleset which defaults to zero.

The CEPH_DEFAULT_CRUSH_REPLICATED_RULESET enum is moved from osd_type.h to
config.h because it may be needed when osd_type.h is not included.

Signed-off-by: Loic Dachary <loic@dachary.org>
qa/workunits/cephtool/test.sh
src/common/config.h
src/common/config_opts.h
src/osd/OSDMap.cc
src/osd/OSDMap.h
src/osd/osd_types.h
src/test/cli/osdmaptool/clobber.t
src/test/cli/osdmaptool/create-print.t
src/test/cli/osdmaptool/create-racks.t