mds: check both frag_stat and nest_stat when validating inode

Signed-off-by: Yan, Zheng <zyan@redhat.com>

diff --git a/src/mds/CInode.cc b/src/mds/CInode.cc
index fd8cf8485ed994a73169a9aefbc666e7b1006b6e..5987c129d4f5e0f21ab6f0f0bdc721ca4cda4d81 100644 (file)
--- a/src/mds/CInode.cc
+++ b/src/mds/CInode.cc
@@ -3921,32 +3921,36 @@ void CInode::validate_disk_state(CInode::validated_data *results,
 
     bool _dirfrags(int rval) {
       // basic reporting setup
-      results->raw_rstats.checked = true;
-      results->raw_rstats.ondisk_read_retval = rval;
-      results->raw_rstats.passed = false; // we'll set it true if we make it
+      results->raw_stats.checked = true;
+      results->raw_stats.ondisk_read_retval = rval;
       if (rval != 0) {
-        results->raw_rstats.error_str << "Failed to read dirfrags off disk";
+        results->raw_stats.error_str << "Failed to read dirfrags off disk";
         return true;
       }
 
       // check each dirfrag...
-      nest_info_t& sub_info = results->raw_rstats.ondisk_value;
+
+      frag_info_t& dir_info = results->raw_stats.ondisk_value.dirstat;
+      nest_info_t& nest_info = results->raw_stats.ondisk_value.rstat;
       for (compact_map<frag_t,CDir*>::iterator p = in->dirfrags.begin();
           p != in->dirfrags.end();
           ++p) {
        CDir *dir = p->second;
        assert(dir->get_version() > 0);
-       sub_info.add(dir->fnode.accounted_rstat);
+       nest_info.add(dir->fnode.accounted_rstat);
+       dir_info.add(dir->fnode.accounted_fragstat);
       }
+      nest_info.rsubdirs++; // it gets one to account for self
       // ...and that their sum matches our inode settings
-      results->raw_rstats.memory_value = in->inode.rstat;
-      sub_info.rsubdirs++; // it gets one to account for self
-      if (!sub_info.same_sums(in->inode.rstat)) {
-        results->raw_rstats.error_str
+      results->raw_stats.memory_value.dirstat = in->inode.dirstat;
+      results->raw_stats.memory_value.rstat = in->inode.rstat;
+      if (!dir_info.same_sums(in->inode.dirstat) ||
+         !nest_info.same_sums(in->inode.rstat)) {
+        results->raw_stats.error_str
         << "freshly-calculated rstats don't match existing ones";
         return true;
       }
-      results->raw_rstats.passed = true;
+      results->raw_stats.passed = true;
       // Hurray! We made it through!
       results->passed_validation = true;
       return true;
@@ -3986,24 +3990,26 @@ void CInode::validated_data::dump(Formatter *f) const
       f->dump_string("error_str", backtrace.error_str.str());
     }
     f->close_section(); // backtrace
-    f->open_object_section("raw_rstats");
+    f->open_object_section("raw_stats");
     {
-      f->dump_bool("checked", raw_rstats.checked);
-      f->dump_bool("passed", raw_rstats.passed);
-      f->dump_int("read_ret_val", raw_rstats.ondisk_read_retval);
-      f->dump_stream("ondisk_value") << raw_rstats.ondisk_value;
-      f->dump_stream("memory_value") << raw_rstats.memory_value;
-      f->dump_string("error_str", raw_rstats.error_str.str());
+      f->dump_bool("checked", raw_stats.checked);
+      f->dump_bool("passed", raw_stats.passed);
+      f->dump_int("read_ret_val", raw_stats.ondisk_read_retval);
+      f->dump_stream("ondisk_value.dirstat") << raw_stats.ondisk_value.dirstat;
+      f->dump_stream("ondisk_value.rstat") << raw_stats.ondisk_value.rstat;
+      f->dump_stream("memory_value.dirrstat") << raw_stats.memory_value.dirstat;
+      f->dump_stream("memory_value.rstat") << raw_stats.memory_value.rstat;
+      f->dump_string("error_str", raw_stats.error_str.str());
     }
-    f->close_section(); // raw_rstats
+    f->close_section(); // raw_stats
     // dump failure return code
     int rc = 0;
     if (backtrace.checked && backtrace.ondisk_read_retval)
       rc = backtrace.ondisk_read_retval;
     if (inode.checked && inode.ondisk_read_retval)
       rc = inode.ondisk_read_retval;
-    if (raw_rstats.checked && raw_rstats.ondisk_read_retval)
-      rc = raw_rstats.ondisk_read_retval;
+    if (raw_stats.checked && raw_stats.ondisk_read_retval)
+      rc = raw_stats.ondisk_read_retval;
     f->dump_int("return_code", rc);
   }
   f->close_section(); // results

diff --git a/src/mds/CInode.h b/src/mds/CInode.h
index a393b4cbf90a0c863cef8e6e75839c19c3f802a6..4408973a8e9bffd569861c754e0142ce76f9a533 100644 (file)
--- a/src/mds/CInode.h
+++ b/src/mds/CInode.h
@@ -1076,9 +1076,14 @@ public:
     bool performed_validation;
     bool passed_validation;
 
+    struct raw_stats_t {
+      frag_info_t dirstat;
+      nest_info_t rstat;
+    };
+
     member_status<inode_backtrace_t> backtrace;
     member_status<inode_t> inode;
-    member_status<nest_info_t> raw_rstats;
+    member_status<raw_stats_t> raw_stats;
 
     validated_data() : performed_validation(false),
         passed_validation(false) {}

diff --git a/src/mds/mdstypes.h b/src/mds/mdstypes.h
index 02e09cd59a424accdccab24a2bd2b2d3d8de380e..2d424be12b3f41e5d7d2107eeb6226909aaf018d 100644 (file)
--- a/src/mds/mdstypes.h
+++ b/src/mds/mdstypes.h
@@ -161,6 +161,10 @@ struct frag_info_t : public scatter_info_t {
     nsubdirs += other.nsubdirs;
   }
 
+  bool same_sums(const frag_info_t &o) const {
+    return nfiles == o.nfiles && nsubdirs == o.nsubdirs;
+  }
+
   void encode(bufferlist &bl) const;
   void decode(bufferlist::iterator& bl);
   void dump(Formatter *f) const;