linux-stable.git/net/ceph/osdmap.c, branch linux-3.17.y

crush: decode and initialize chooseleaf_vary_r

2014-05-16T17:29:55+00:00

Commit e2b149cc4ba0 ("crush: add chooseleaf_vary_r tunable") added the
crush_map::chooseleaf_vary_r field but missed the decode part.  This
lead to misdirected requests caused by incorrect raw crush mapping
sets.

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

Reported-and-Tested-by: Dmitry Smirnov 
Signed-off-by: Ilya Dryomov 
Reviewed-by: Sage Weil

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

2014-04-28T19:54:10+00:00

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 
Reviewed-by: Sage Weil

libceph: output primary affinity values on osdmap updates

2014-04-05T04:08:28+00:00

Similar to osd weights, output primary affinity values on incremental
osdmap updates.

Signed-off-by: Ilya Dryomov

libceph: redo ceph_calc_pg_primary() in terms of ceph_calc_pg_acting()

2014-04-05T04:08:19+00:00

Reimplement ceph_calc_pg_primary() in terms of ceph_calc_pg_acting()
and get rid of the now unused calc_pg_raw().

Signed-off-by: Ilya Dryomov 
Reviewed-by: Alex Elder

libceph: add support for osd primary affinity

2014-04-05T04:08:17+00:00

Respond to non-default primary_affinity values accordingly.  (Primary
affinity allows the admin to shift 'primary responsibility' away from
specific osds, effectively shifting around the read side of the
workload and whatever overhead is incurred by peering and writes by
virtue of being the primary).

Signed-off-by: Ilya Dryomov 
Reviewed-by: Alex Elder

libceph: add support for primary_temp mappings

2014-04-05T04:08:16+00:00

Change apply_temp() to override primary in the same way pg_temp
overrides osd set.  primary_temp overrides pg_temp primary too.

Signed-off-by: Ilya Dryomov 
Reviewed-by: Alex Elder

libceph: return primary from ceph_calc_pg_acting()

2014-04-05T04:08:14+00:00

In preparation for adding support for primary_temp, stop assuming
primaryness: add a primary out parameter to ceph_calc_pg_acting() and
change call sites accordingly.  Primary is now specified separately
from the order of osds in the set.

Signed-off-by: Ilya Dryomov 
Reviewed-by: Alex Elder

libceph: switch ceph_calc_pg_acting() to new helpers

2014-04-05T04:08:13+00:00

Switch ceph_calc_pg_acting() to new helpers: pg_to_raw_osds(),
raw_to_up_osds() and apply_temps().

Signed-off-by: Ilya Dryomov 
Reviewed-by: Alex Elder

libceph: introduce apply_temps() helper

2014-04-05T04:08:11+00:00

apply_temp() helper for applying various temporary mappings (at this
point only pg_temp mappings) to the up set, therefore transforming it
into an acting set.

Signed-off-by: Ilya Dryomov 
Reviewed-by: Alex Elder

libceph: introduce pg_to_raw_osds() and raw_to_up_osds() helpers

2014-04-05T04:08:10+00:00

pg_to_raw_osds() helper for computing a raw (crush) set, which can
contain non-existant and down osds.

raw_to_up_osds() helper for pruning non-existant and down osds from the
raw set, therefore transforming it into an up set, and determining up
primary.

Signed-off-by: Ilya Dryomov 
Reviewed-by: Alex Elder