From e6854d4f186ffee6f5ab5068e45106c60e4449bb Mon Sep 17 00:00:00 2001
From: Venky Shankar <vshankar@redhat.com>
Date: Fri, 13 Dec 2019 12:34:04 -0500
Subject: [PATCH] mds: add feature_bitset_t::dump()

Signed-off-by: Venky Shankar <vshankar@redhat.com>
---
 src/mds/mdstypes.cc | 9 ++++++++-
 src/mds/mdstypes.h  | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/mds/mdstypes.cc b/src/mds/mdstypes.cc
index d044166883f..198a41ebdda 100644
--- a/src/mds/mdstypes.cc
+++ b/src/mds/mdstypes.cc
@@ -4,6 +4,7 @@
 #include "mdstypes.h"
 #include "MDSContext.h"
 #include "common/Formatter.h"
+#include "common/StackStringStream.h"
 
 const mds_gid_t MDS_GID_NONE = mds_gid_t(0);
 
@@ -431,6 +432,12 @@ void feature_bitset_t::decode(bufferlist::const_iterator &p) {
   }
 }
 
+void feature_bitset_t::dump(Formatter *f) const {
+  CachedStackStringStream css;
+  print(*css);
+  f->dump_string("feature_bits", css->strv());
+}
+
 void feature_bitset_t::print(ostream& out) const
 {
   std::ios_base::fmtflags f(out.flags());
@@ -462,7 +469,7 @@ void client_metadata_t::decode(bufferlist::const_iterator& p)
 
 void client_metadata_t::dump(Formatter *f) const
 {
-  f->dump_stream("features") << features;
+  f->dump_object("client_features", features);
   for (const auto& [name, val] : kv_map)
     f->dump_string(name.c_str(), val);
 }
diff --git a/src/mds/mdstypes.h b/src/mds/mdstypes.h
index 23c6607ce37..4ff01cd2de9 100644
--- a/src/mds/mdstypes.h
+++ b/src/mds/mdstypes.h
@@ -1104,6 +1104,7 @@ public:
   feature_bitset_t& operator-=(const feature_bitset_t& other);
   void encode(bufferlist& bl) const;
   void decode(bufferlist::const_iterator &p);
+  void dump(Formatter *f) const;
   void print(ostream& out) const;
 private:
   vector<block_type> _vec;
-- 
2.39.5