RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-20 09:27:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17510 from liewegas/wip-crush-fix-rule-lookup

Browse Source 
crush: fix fast rule lookup when uniform

Reviewed-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Sage Weil 2017-09-06 13:41:55 -05:00 committed by GitHub
commit bd52ddd681
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/crush/CrushWrapper.h
View File

@ -1261,14 +1261,15 @@ public:
int find_rule(int ruleset, int type, int size) const {
if (!crush) return -1;
if (!have_uniform_rules) {
return crush_find_rule(crush, ruleset, type, size);
} else {
if (ruleset < (int)crush->max_rules &&
crush->rules[ruleset])
return ruleset;
return -1;
if (have_uniform_rules &&
ruleset < (int)crush->max_rules &&
crush->rules[ruleset] &&
crush->rules[ruleset]->mask.type == type &&
crush->rules[ruleset]->mask.min_size <= size &&
crush->rules[ruleset]->mask.max_size >= size) {
return ruleset;
}
return crush_find_rule(crush, ruleset, type, size);
}
bool ruleset_exists(const int ruleset) const {