From: Sage Weil Date: Mon, 2 Dec 2013 18:21:17 +0000 (-0800) Subject: osd/OSDMap: fix typo and crush types helper X-Git-Tag: v0.74~46 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=16b75768b8987858d83377ec93422decfdfd7371;p=ceph.git osd/OSDMap: fix typo and crush types helper Bah! Signed-off-by: Sage Weil --- diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc index 48d21911111b..3ebd3165cc2d 100644 --- a/src/osd/OSDMap.cc +++ b/src/osd/OSDMap.cc @@ -1835,8 +1835,8 @@ int OSDMap::_build_crush_types(CrushWrapper& crush) crush.set_type_name(2, "chassis"); crush.set_type_name(3, "rack"); crush.set_type_name(4, "row"); - crush.set_type_naem(5, "pdu"); - crush.set_type_naem(6, "pod"); + crush.set_type_name(5, "pdu"); + crush.set_type_name(6, "pod"); crush.set_type_name(7, "room"); crush.set_type_name(8, "datacenter"); crush.set_type_name(9, "region"); diff --git a/src/osd/OSDMap.h b/src/osd/OSDMap.h index 105c979453e5..7b6cb1e6c9d4 100644 --- a/src/osd/OSDMap.h +++ b/src/osd/OSDMap.h @@ -597,11 +597,11 @@ public: * handy helpers to build simple maps... */ /// build crush bucket types. @return 'root' type id - int _build_crush_types(CrushWrapper& crush); void build_simple(CephContext *cct, epoch_t e, uuid_d &fsid, int num_osd, int pg_bits, int pgp_bits); int build_simple_from_conf(CephContext *cct, epoch_t e, uuid_d &fsid, int pg_bits, int pgp_bits); + static int _build_crush_types(CrushWrapper& crush); static void build_simple_crush_map(CephContext *cct, CrushWrapper& crush, map& poolsets, int num_osd); static void build_simple_crush_map_from_conf(CephContext *cct, CrushWrapper& crush,