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 ca3cfd8a55f6a78674b90bfddfeb4c9a58720c68..19e0c8fbcfca16bc313c98a1fec1989aca693ab2 100644 (file)
--- 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;