diff options
| author | Loic Dachary <loic@dachary.org> | 2015-04-10 17:51:38 +0200 |
|---|---|---|
| committer | Loic Dachary <loic@dachary.org> | 2015-04-10 17:51:38 +0200 |
| commit | 733864738fa93979727e480e403293e079bb51e9 (patch) | |
| tree | f00e6e3041812d6438c77db63792bbd2a19f96c6 | |
| parent | b5921d55d16796e12d66ad2c4add7305f9ce2353 (diff) | |
| parent | 5ca771a7d1df8e78ee503a7063068cf744d5efcc (diff) | |
| download | ceph-733864738fa93979727e480e403293e079bb51e9.tar.gz | |
Merge pull request #4328 from dachary/wip-11364-hammer
v4 bucket feature detection
Reviewed-by: Sage Weil <sage@redhat.com>
| -rw-r--r-- | src/crush/CrushWrapper.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/crush/CrushWrapper.cc b/src/crush/CrushWrapper.cc index a18f7f5d1b5..497c2196958 100644 --- a/src/crush/CrushWrapper.cc +++ b/src/crush/CrushWrapper.cc @@ -72,7 +72,7 @@ bool CrushWrapper::has_v4_buckets() const crush_bucket *b = crush->buckets[i]; if (!b) continue; - if (b->type == CRUSH_BUCKET_STRAW2) + if (b->alg == CRUSH_BUCKET_STRAW2) return true; } return false; @@ -1438,6 +1438,7 @@ void CrushWrapper::dump_tunables(Formatter *f) const f->dump_int("require_feature_tunables3", (int)has_nondefault_tunables3()); f->dump_int("has_v2_rules", (int)has_v2_rules()); f->dump_int("has_v3_rules", (int)has_v3_rules()); + f->dump_int("has_v4_buckets", (int)has_v4_buckets()); } void CrushWrapper::dump_rules(Formatter *f) const |