From: Sage Weil <sage@inktank.com>
Date: Fri, 11 Jul 2014 13:58:57 +0000 (-0700)
Subject: crush: include CRUSH_V3, v2/v3 rules checks in dump_tunables()
X-Git-Tag: v0.80.9~11^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9fc2fd50aec94233528870aaa371347238a6ea75;p=ceph.git

crush: include CRUSH_V3, v2/v3 rules checks in dump_tunables()

Backport: firefly
Signed-off-by: Sage Weil <sage@inktank.com>
(cherry picked from commit cf94cf3531a349bbd1fc6ee56c3fc260110a252a)
---

diff --git a/src/crush/CrushWrapper.cc b/src/crush/CrushWrapper.cc
index 6cdf09c2e3d..2ed3935e52d 100644
--- a/src/crush/CrushWrapper.cc
+++ b/src/crush/CrushWrapper.cc
@@ -1301,6 +1301,9 @@ void CrushWrapper::dump_tunables(Formatter *f) const
 
   f->dump_int("require_feature_tunables", (int)has_nondefault_tunables());
   f->dump_int("require_feature_tunables2", (int)has_nondefault_tunables2());
+  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());
 }
 
 void CrushWrapper::dump_rules(Formatter *f) const