iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

crush: add SET_CHOOSE_TRIES rule step

Browse Source 
Since we can specify the recursive retries in a rule, we may as well also
specify the non-recursive tries too for completeness.

Reflects ceph.git commit d1b97462cffccc871914859eaee562f2786abfd1.

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Ilya Dryomov
2013-12-24 21:19:26 +02:00
parent f18650ace3
commit cc10df4a3a
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/linux/crush/crush.h
View File

@ -47,7 +47,8 @@ enum {
CRUSH_RULE_CHOOSE_LEAF_FIRSTN = 6, CRUSH_RULE_CHOOSE_LEAF_FIRSTN = 6,
CRUSH_RULE_CHOOSE_LEAF_INDEP = 7, CRUSH_RULE_CHOOSE_LEAF_INDEP = 7,
CRUSH_RULE_SET_CHOOSE_LEAF_TRIES = 9, CRUSH_RULE_SET_CHOOSE_TRIES = 8, /* override choose_total_tries */
CRUSH_RULE_SET_CHOOSE_LEAF_TRIES = 9, /* override chooseleaf_descend_once */
}; };
/* /*

5
net/ceph/crush/mapper.c
View File

@ -661,6 +661,11 @@ int crush_do_rule(const struct crush_map *map,
wsize = 1; wsize = 1;
break; break;
case CRUSH_RULE_SET_CHOOSE_TRIES:
if (curstep->arg1 > 0)
choose_tries = curstep->arg1;
break;
case CRUSH_RULE_SET_CHOOSE_LEAF_TRIES: case CRUSH_RULE_SET_CHOOSE_LEAF_TRIES:
if (curstep->arg1 > 0) if (curstep->arg1 > 0)
choose_leaf_tries = curstep->arg1; choose_leaf_tries = curstep->arg1;