Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libceph: fix non-default values check in apply_primary_affinity()

Browse source 
osd_primary_affinity array is indexed into incorrectly when checking
for non-default primary-affinity values.  This nullifies the impact of
the rest of the apply_primary_affinity() and results in misdirected
requests.

                if (osds[i] != CRUSH_ITEM_NONE &&
                    osdmap->osd_primary_affinity[i] !=
                                                ^^^
                                        CEPH_OSD_DEFAULT_PRIMARY_AFFINITY) {

For a pool with size 2, this always ends up checking osd0 and osd1
primary_affinity values, instead of the values that correspond to the
osds in question.  E.g., given a [2,3] up set and a [max,max,0,max]
primary affinity vector, requests are still sent to osd2, because both
osd0 and osd1 happen to have max primary_affinity values and therefore
we return from apply_primary_affinity() early on the premise that all
osds in the given set have max (default) values.  Fix it.

Fixes: http://tracker.ceph.com/issues/7954

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Ilya Dryomov 2014-04-10 18:09:41 +04:00 committed by Sage Weil
parent 6da5246dd4
commit 92b2e75158
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
net/ceph/osdmap.c
View file

@ -1548,8 +1548,10 @@ static void apply_primary_affinity(struct ceph_osdmap *osdmap, u32 pps,
return; return;
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
if (osds[i] != CRUSH_ITEM_NONE && int osd = osds[i];
osdmap->osd_primary_affinity[i] !=
if (osd != CRUSH_ITEM_NONE &&
osdmap->osd_primary_affinity[osd] !=
CEPH_OSD_DEFAULT_PRIMARY_AFFINITY) { CEPH_OSD_DEFAULT_PRIMARY_AFFINITY) {
break; break;
} }
@ -1563,10 +1565,9 @@ static void apply_primary_affinity(struct ceph_osdmap *osdmap, u32 pps,
* osd's pgs get rejected as primary. * osd's pgs get rejected as primary.
*/ */
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
int osd; int osd = osds[i];
u32 aff; u32 aff;
osd = osds[i];
if (osd == CRUSH_ITEM_NONE) if (osd == CRUSH_ITEM_NONE)
continue; continue;