Revert "osdmap: spread replicas across hosts with default crush map"

This reverts commit 7ea5d84fa3d0ed3db61eea7eb9fa8dbee53244b6.

This breaks teuthology and vstart both in its current state.

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index 93ecb6055b6d8431bd58ed2b11cd8edf38d7cdb2..63a1fae809bc45524fa9512aa68e488f5970cef4 100644 (file)
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -1680,8 +1680,8 @@ void OSDMap::build_simple_crush_map(CephContext *cct, CrushWrapper& crush,
     crush_rule *rule = crush_make_rule(3, ruleset, pg_pool_t::TYPE_REP, minrep, maxrep);
     assert(rule);
     crush_rule_set_step(rule, 0, CRUSH_RULE_TAKE, rootid, 0);
-    // spread across hosts
-    crush_rule_set_step(rule, 1, CRUSH_RULE_CHOOSE_LEAF_FIRSTN, CRUSH_CHOOSE_N, 1);
+    // just spread across osds
+    crush_rule_set_step(rule, 1, CRUSH_RULE_CHOOSE_FIRSTN, CRUSH_CHOOSE_N, 0);
     crush_rule_set_step(rule, 2, CRUSH_RULE_EMIT, 0, 0);
     int rno = crush_add_rule(crush.crush, rule, -1);
     crush.set_rule_name(rno, p->second);