@@ -59,8 +59,7 @@ enum {
CRUSH_RULE_SET_CHOOSELEAF_TRIES = 9, /* override chooseleaf_descend_once */
CRUSH_RULE_SET_CHOOSE_LOCAL_TRIES = 10,
CRUSH_RULE_SET_CHOOSE_LOCAL_FALLBACK_TRIES = 11,
- CRUSH_RULE_SET_CHOOSELEAF_VARY_R = 12,
- CRUSH_RULE_SET_CHOOSELEAF_STABLE = 13
+ CRUSH_RULE_SET_CHOOSELEAF_VARY_R = 12
};
/*
@@ -206,11 +205,6 @@ struct crush_map {
* mappings line up a bit better with previous mappings. */
__u8 chooseleaf_vary_r;
- /* if true, it makes chooseleaf firstn to return stable results (if
- * no local retry) so that data migrations would be optimal when some
- * device fails. */
- __u8 chooseleaf_stable;
-
#ifndef __KERNEL__
/*
* version 0 (original) of straw_calc has various flaws. version 1
@@ -403,7 +403,6 @@ static int is_out(const struct crush_map *map,
* @local_retries: localized retries
* @local_fallback_retries: localized fallback retries
* @recurse_to_leaf: true if we want one device under each item of given type (chooseleaf instead of choose)
- * @stable: stable mode starts rep=0 in the recursive call for all replicas
* @vary_r: pass r to recursive calls
* @out2: second output vector for leaf items (if @recurse_to_leaf)
* @parent_r: r value passed from the parent
@@ -420,7 +419,6 @@ static int crush_choose_firstn(const struct crush_map *map,
unsigned int local_fallback_retries,
int recurse_to_leaf,
unsigned int vary_r,
- unsigned int stable,
int *out2,
int parent_r)
{
@@ -435,13 +433,13 @@ static int crush_choose_firstn(const struct crush_map *map,
int collide, reject;
int count = out_size;
- dprintk("CHOOSE%s bucket %d x %d outpos %d numrep %d tries %d recurse_tries %d local_retries %d local_fallback_retries %d parent_r %d stable %d\n",
+ dprintk("CHOOSE%s bucket %d x %d outpos %d numrep %d tries %d recurse_tries %d local_retries %d local_fallback_retries %d parent_r %d\n",
recurse_to_leaf ? "_LEAF" : "",
bucket->id, x, outpos, numrep,
tries, recurse_tries, local_retries, local_fallback_retries,
- parent_r, stable);
+ parent_r);
- for (rep = stable ? 0 : outpos; rep < numrep && count > 0 ; rep++) {
+ for (rep = outpos; rep < numrep && count > 0 ; rep++) {
/* keep trying until we get a non-out, non-colliding item */
ftotal = 0;
skip_rep = 0;
@@ -514,14 +512,13 @@ static int crush_choose_firstn(const struct crush_map *map,
if (crush_choose_firstn(map,
map->buckets[-1-item],
weight, weight_max,
- x, stable ? 1 : outpos+1, 0,
+ x, outpos+1, 0,
out2, outpos, count,
recurse_tries, 0,
local_retries,
local_fallback_retries,
0,
vary_r,
- stable,
NULL,
sub_r) <= outpos)
/* didn't get leaf */
@@ -819,7 +816,6 @@ int crush_do_rule(const struct crush_map *map,
int choose_local_fallback_retries = map->choose_local_fallback_tries;
int vary_r = map->chooseleaf_vary_r;
- int stable = map->chooseleaf_stable;
if ((__u32)ruleno >= map->max_rules) {
dprintk(" bad ruleno %d\n", ruleno);
@@ -874,11 +870,6 @@ int crush_do_rule(const struct crush_map *map,
vary_r = curstep->arg1;
break;
- case CRUSH_RULE_SET_CHOOSELEAF_STABLE:
- if (curstep->arg1 >= 0)
- stable = curstep->arg1;
- break;
-
case CRUSH_RULE_CHOOSELEAF_FIRSTN:
case CRUSH_RULE_CHOOSE_FIRSTN:
firstn = 1;
@@ -941,7 +932,6 @@ int crush_do_rule(const struct crush_map *map,
choose_local_fallback_retries,
recurse_to_leaf,
vary_r,
- stable,
c+osize,
0);
} else {
BugLink: https://bugs.launchpad.net/bugs/1737033 This reverts commit 74771960c7794994fd9067cdd8df0725b6ce75f6. Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com> --- include/linux/crush/crush.h | 8 +------- net/ceph/crush/mapper.c | 18 ++++-------------- 2 files changed, 5 insertions(+), 21 deletions(-)