From f164b87785980e81f7c76457d49c5133ed154b4f Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 19 Apr 2012 22:00:54 -0700 Subject: [PATCH] osdmap: do not forcefeed preferred osd to crush Signed-off-by: Sage Weil --- src/osd/OSDMap.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/osd/OSDMap.h b/src/osd/OSDMap.h index 04583a166a179..7cd8ed321835b 100644 --- a/src/osd/OSDMap.h +++ b/src/osd/OSDMap.h @@ -462,16 +462,12 @@ private: ps_t pps = pool.raw_pg_to_pps(pg); // placement ps unsigned size = pool.get_size(); { - int preferred = pg.preferred(); - if (preferred >= max_osd || preferred >= crush.get_max_devices()) - preferred = -1; - assert(get_max_osd() >= crush.get_max_devices()); // what crush rule? int ruleno = crush.find_rule(pool.get_crush_ruleset(), pool.get_type(), size); if (ruleno >= 0) - crush.do_rule(ruleno, pps, osds, size, preferred, osd_weight); + crush.do_rule(ruleno, pps, osds, size, -1, osd_weight); } return osds.size(); -- 2.39.5