Reviewed-by: Sage Weil <sage@xxxxxxxxxxx>
On Thu, 10 Apr 2014, Ilya Dryomov wrote:
> 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@xxxxxxxxxxx>
> ---
> net/ceph/osdmap.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/net/ceph/osdmap.c b/net/ceph/osdmap.c
> index e632b5a52f5b..8b8a5a24b223 100644
> --- a/net/ceph/osdmap.c
> +++ b/net/ceph/osdmap.c
> @@ -1548,8 +1548,10 @@ static void apply_primary_affinity(struct ceph_osdmap *osdmap, u32 pps,
> return;
>
> for (i = 0; i < len; i++) {
> - if (osds[i] != CRUSH_ITEM_NONE &&
> - osdmap->osd_primary_affinity[i] !=
> + int osd = osds[i];
> +
> + if (osd != CRUSH_ITEM_NONE &&
> + osdmap->osd_primary_affinity[osd] !=
> CEPH_OSD_DEFAULT_PRIMARY_AFFINITY) {
> break;
> }
> @@ -1563,10 +1565,9 @@ static void apply_primary_affinity(struct ceph_osdmap *osdmap, u32 pps,
> * osd's pgs get rejected as primary.
> */
> for (i = 0; i < len; i++) {
> - int osd;
> + int osd = osds[i];
> u32 aff;
>
> - osd = osds[i];
> if (osd == CRUSH_ITEM_NONE)
> continue;
>
> --
> 1.7.10.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
>
--
To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
