From: Sage Weil <sage@redhat.com>
Date: Mon, 19 Jan 2015 17:03:20 +0000 (-0800)
Subject: crush: fix dump for hammer tunables
X-Git-Tag: v0.93~161^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0eca13ddf8b216e6ccecd2e83fbc1d5d85b730eb;p=ceph.git

crush: fix dump for hammer tunables

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/crush/CrushWrapper.cc b/src/crush/CrushWrapper.cc
index fb255c528552..a18f7f5d1b57 100644
--- a/src/crush/CrushWrapper.cc
+++ b/src/crush/CrushWrapper.cc
@@ -1420,7 +1420,9 @@ void CrushWrapper::dump_tunables(Formatter *f) const
   f->dump_int("allowed_bucket_algs", get_allowed_bucket_algs());
 
   // be helpful about it
-  if (has_firefly_tunables())
+  if (has_hammer_tunables())
+    f->dump_string("profile", "hammer");
+  else if (has_firefly_tunables())
     f->dump_string("profile", "firefly");
   else if (has_bobtail_tunables())
     f->dump_string("profile", "bobtail");