summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlya Dryomov <ilya.dryomov@inktank.com>2013-12-24 21:19:26 +0200
committerIlya Dryomov <ilya.dryomov@inktank.com>2013-12-31 20:32:23 +0200
commitcc10df4a3a5c34cb1d5b635ac70dd1fc406153ce (patch)
tree76d7ee1a25c12f0abf4d31cdd55025bc521ab242
parentf18650ace38ef200dd1578257c75e9407297953c (diff)
crush: add SET_CHOOSE_TRIES rule step
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>
-rw-r--r--include/linux/crush/crush.h3
-rw-r--r--net/ceph/crush/mapper.c5
2 files changed, 7 insertions, 1 deletions
diff --git a/include/linux/crush/crush.h b/include/linux/crush/crush.h
index 07b8fd4f81fc..5f95969347ec 100644
--- a/include/linux/crush/crush.h
+++ b/include/linux/crush/crush.h
@@ -47,7 +47,8 @@ enum {
CRUSH_RULE_CHOOSE_LEAF_FIRSTN = 6,
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 */
};
/*
diff --git a/net/ceph/crush/mapper.c b/net/ceph/crush/mapper.c
index c34320518c8b..a1acdea935bf 100644
--- a/net/ceph/crush/mapper.c
+++ b/net/ceph/crush/mapper.c
@@ -661,6 +661,11 @@ int crush_do_rule(const struct crush_map *map,
wsize = 1;
break;
+ case CRUSH_RULE_SET_CHOOSE_TRIES:
+ if (curstep->arg1 > 0)
+ choose_tries = curstep->arg1;
+ break;
+
case CRUSH_RULE_SET_CHOOSE_LEAF_TRIES:
if (curstep->arg1 > 0)
choose_leaf_tries = curstep->arg1;