From: Sage Weil <sage@newdream.net>
Date: Tue, 17 May 2011 20:29:30 +0000 (-0700)
Subject: osdmap: use straw buckets everywhere by default
X-Git-Tag: v0.29~86^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e46804bbf82c99a96189b2d634660946d8ac6460;p=ceph.git

osdmap: use straw buckets everywhere by default

We were using uniform for the leaf buckets. Use straw instead.

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index ca3cfd8a55f6..19e0c8fbcfca 100644
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -180,7 +180,7 @@ void OSDMap::build_simple_crush_map(CrushWrapper& crush, map<int, const char*>&
 	rweights[i] += 0x10000;
       }
 
-      crush_bucket *domain = crush_make_bucket(CRUSH_BUCKET_UNIFORM, CRUSH_HASH_DEFAULT, 1, j, items, weights);
+      crush_bucket *domain = crush_make_bucket(CRUSH_BUCKET_STRAW, CRUSH_HASH_DEFAULT, 1, j, items, weights);
       ritems[i] = crush_add_bucket(crush.crush, 0, domain);
       dout(20) << "added domain bucket i " << ritems[i] << " of size " << j << dendl;