From 9c20f998c2828093e44dd137b9826533447c2afb Mon Sep 17 00:00:00 2001 From: sageweil Date: Thu, 7 Dec 2006 19:08:54 +0000 Subject: [PATCH] improved forcefeeding of crush git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@983 29311d96-e01e-0410-9327-a35deaab8ce9 --- ceph/osd/OSDMap.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/ceph/osd/OSDMap.h b/ceph/osd/OSDMap.h index 8a449ba631c86..2c00eea9cdbdc 100644 --- a/ceph/osd/OSDMap.h +++ b/ceph/osd/OSDMap.h @@ -356,18 +356,14 @@ private: case PG_LAYOUT_CRUSH: { int forcefeed = -1; - if (pg.u.fields.preferred > 0) { + if (pg.u.fields.preferred > 0 && + out_osds.count(pg.u.fields.preferred-1) == 0) forcefeed = pg.u.fields.preferred-1; - if (out_osds.count(forcefeed)) - forcefeed = -1; // or not! - } crush.do_rule(crush.rules[num_rep], // FIXME rule thing. ps, osds, out_osds, overload_osds, forcefeed); - //if (forcefeed >= 0) - //cout << "forcefeed " << forcefeed << " result " << osds << endl; } break; -- 2.39.5