From f8291627a66cff958ea6f0aceeb08e441979966c Mon Sep 17 00:00:00 2001
From: simon gao <simon29rock@gmail.com>
Date: Tue, 23 Jul 2019 04:56:51 -0400
Subject: [PATCH] ceph-mds: dump all info of ceph_file_layout, InodeStoreBase,
 frag_info_t, inode_t

Signed-off-by: simon gao <simon29rock@gmail.com>
---
 src/common/fs_types.cc |  3 +++
 src/mds/CInode.cc      | 19 ++++++++++++++++---
 src/mds/mdstypes.cc    |  1 +
 src/mds/mdstypes.h     |  8 ++++++++
 4 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/common/fs_types.cc b/src/common/fs_types.cc
index 6ad4b24c312..feb9167264f 100644
--- a/src/common/fs_types.cc
+++ b/src/common/fs_types.cc
@@ -19,6 +19,9 @@ void dump(const ceph_file_layout& l, Formatter *f)
 void dump(const ceph_dir_layout& l, Formatter *f)
 {
   f->dump_unsigned("dir_hash", l.dl_dir_hash);
+  f->dump_unsigned("unused1", l.dl_unused1);
+  f->dump_unsigned("unused2", l.dl_unused2);
+  f->dump_unsigned("unused3", l.dl_unused3);
 }
 
 
diff --git a/src/mds/CInode.cc b/src/mds/CInode.cc
index c0f812a766c..a5bea401952 100644
--- a/src/mds/CInode.cc
+++ b/src/mds/CInode.cc
@@ -4029,6 +4029,20 @@ void InodeStoreBase::dump(Formatter *f) const
 {
   inode.dump(f);
   f->dump_string("symlink", symlink);
+
+  f->open_array_section("xattrs");
+  for (const auto& [key, val] : xattrs) {
+    f->open_object_section("xattr");
+    f->dump_string("key", key);
+    std::string v(val.c_str(), val.length());
+    f->dump_string("val", v);
+    f->close_section();
+  }
+  f->close_section();
+  f->open_object_section("dirfragtree");
+  dirfragtree.dump(f);
+  f->close_section(); // dirfragtree
+  
   f->open_array_section("old_inodes");
   for (const auto &p : old_inodes) {
     f->open_object_section("old_inode");
@@ -4039,9 +4053,8 @@ void InodeStoreBase::dump(Formatter *f) const
   }
   f->close_section();  // old_inodes
 
-  f->open_object_section("dirfragtree");
-  dirfragtree.dump(f);
-  f->close_section(); // dirfragtree
+  f->dump_unsigned("oldest_snap", oldest_snap);
+  f->dump_unsigned("damage_flags", damage_flags);
 }
 
 
diff --git a/src/mds/mdstypes.cc b/src/mds/mdstypes.cc
index 6a207f85b43..d65bfb5c008 100644
--- a/src/mds/mdstypes.cc
+++ b/src/mds/mdstypes.cc
@@ -43,6 +43,7 @@ void frag_info_t::dump(Formatter *f) const
   f->dump_stream("mtime") << mtime;
   f->dump_unsigned("num_files", nfiles);
   f->dump_unsigned("num_subdirs", nsubdirs);
+  f->dump_unsigned("change_attr", change_attr);
 }
 
 void frag_info_t::generate_test_instances(std::list<frag_info_t*>& ls)
diff --git a/src/mds/mdstypes.h b/src/mds/mdstypes.h
index 9f701549693..49627231fa1 100644
--- a/src/mds/mdstypes.h
+++ b/src/mds/mdstypes.h
@@ -848,6 +848,14 @@ void inode_t<Allocator>::dump(Formatter *f) const
   f->dump_unsigned("backtrace_version", backtrace_version);
 
   f->dump_string("stray_prior_path", stray_prior_path);
+  f->dump_unsigned("max_size_ever", max_size_ever);
+
+  f->open_object_section("quota");
+  quota.dump(f);
+  f->close_section();
+
+  f->dump_stream("last_scrub_stamp") << last_scrub_stamp;
+  f->dump_unsigned("last_scrub_version", last_scrub_version);
 }
 
 template<template<typename> class Allocator>
-- 
2.39.5