From: Sage Weil <sage.weil@dreamhost.com>
Date: Wed, 4 Apr 2012 00:01:51 +0000 (-0700)
Subject: osdmap: set 'default' pool type correctly
X-Git-Tag: v0.46~129
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=56a6aa7a4bcd9c9bdea6d2c8ce1c290fbec6da6f;p=ceph.git

osdmap: set 'default' pool type correctly

Got this wrong in e85961167eb1f37f80f263257799e4e901d17e74

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
---

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index d7f184fba638..42c0608f9301 100644
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -1129,7 +1129,7 @@ void OSDMap::build_simple_crush_map(CephContext *cct, CrushWrapper& crush,
   crush.set_type_name(6, "pool");
 
   // root
-  int rootid = crush.add_bucket(0, CRUSH_BUCKET_STRAW, CRUSH_HASH_DEFAULT, 3 /* pool */, 0, NULL, NULL);
+  int rootid = crush.add_bucket(0, CRUSH_BUCKET_STRAW, CRUSH_HASH_DEFAULT, 6 /* pool */, 0, NULL, NULL);
   crush.set_item_name(rootid, "default");
 
   for (int o=0; o<nosd; o++) {
@@ -1238,12 +1238,15 @@ void OSDMap::build_simple_crush_map_from_conf(CephContext *cct, CrushWrapper& cr
   crush.set_type_name(0, "osd");
   crush.set_type_name(1, "host");
   crush.set_type_name(2, "rack");
-  crush.set_type_name(3, "pool");
+  crush.set_type_name(3, "row");
+  crush.set_type_name(4, "room");
+  crush.set_type_name(5, "datacenter");
+  crush.set_type_name(6, "pool");
 
   set<string> hosts, racks;
 
   // root
-  int rootid = crush.add_bucket(0, CRUSH_BUCKET_STRAW, CRUSH_HASH_DEFAULT, 3 /* pool */, 0, NULL, NULL);
+  int rootid = crush.add_bucket(0, CRUSH_BUCKET_STRAW, CRUSH_HASH_DEFAULT, 6 /* pool */, 0, NULL, NULL);
   crush.set_item_name(rootid, "default");
 
   // add osds