osd: Without snapdir we don't have a head mismatch error anymore

Signed-off-by: David Zafman <dzafman@redhat.com>

diff --git a/doc/rados/command/list-inconsistent-snap.json b/doc/rados/command/list-inconsistent-snap.json
index 76bb478cfafbc3b4a12d780edcf20b9439361550..70f4335fe8032e00d4fa36559c9273e5a44ab1e6 100644 (file)
--- a/doc/rados/command/list-inconsistent-snap.json
+++ b/doc/rados/command/list-inconsistent-snap.json
@@ -45,7 +45,6 @@
                 "info_missing",
                 "info_corrupted",
                 "snapset_mismatch",
-                "head_mismatch",
                 "headless",
                 "size_mismatch",
                 "extra_clones",

diff --git a/src/common/scrub_types.cc b/src/common/scrub_types.cc
index 11f0d8bcd9ad64b7b146ec24551fcf7fff59e8f5..d1948dd9fee1c3199686af21158524910e22c42a 100644 (file)
--- a/src/common/scrub_types.cc
+++ b/src/common/scrub_types.cc
@@ -222,11 +222,6 @@ void inconsistent_snapset_wrapper::set_snapset_mismatch()
   errors |= inc_snapset_t::SNAP_MISMATCH;
 }
 
-void inconsistent_snapset_wrapper::set_head_mismatch()
-{
-  errors |= inc_snapset_t::HEAD_MISMATCH;
-}
-
 void inconsistent_snapset_wrapper::set_size_mismatch()
 {
   errors |= inc_snapset_t::SIZE_MISMATCH;

diff --git a/src/common/scrub_types.h b/src/common/scrub_types.h
index 347f9fb6bcace19d3b378f2ddb75c7c6d9e986e9..5ed7ac5c158b82f95d3757b9e6230deb5c1e050b 100644 (file)
--- a/src/common/scrub_types.h
+++ b/src/common/scrub_types.h
@@ -163,8 +163,6 @@ struct inconsistent_snapset_wrapper : public librados::inconsistent_snapset_t {
   void set_clone(snapid_t);
   // the snapset is not consistent with itself
   void set_snapset_mismatch();
-  // soid.snap inconsistent with snapset
-  void set_head_mismatch();
   void set_size_mismatch();
 
   void encode(bufferlist& bl) const;

diff --git a/src/include/rados/rados_types.hpp b/src/include/rados/rados_types.hpp
index 652fbe1b18687cd4ae8799d922c414f6c9ea0cfc..07635805af3f4f542a91e635b8fcfc5f5eca01c8 100644 (file)
--- a/src/include/rados/rados_types.hpp
+++ b/src/include/rados/rados_types.hpp
@@ -251,7 +251,7 @@ struct inconsistent_snapset_t {
     SNAPSET_CORRUPTED = 1 << 1,
     CLONE_MISSING  = 1 << 2,
     SNAP_MISMATCH  = 1 << 3,
-    HEAD_MISMATCH  = 1 << 4,
+    HEAD_MISMATCH  = 1 << 4,  // Unused
     HEADLESS_CLONE = 1 << 5,
     SIZE_MISMATCH  = 1 << 6,
     OI_MISSING   = 1 << 7,    // Old
@@ -284,8 +284,8 @@ struct inconsistent_snapset_t {
   bool snapset_mismatch() const {
     return errors & SNAP_MISMATCH;
   }
-  bool head_mismatch() const {
-    return errors & HEAD_MISMATCH;
+  bool head_mismatch() const {      // Compatibility
+    return false;
   }
   bool headless() const {
     return errors & HEADLESS_CLONE;

diff --git a/src/tools/rados/rados.cc b/src/tools/rados/rados.cc
index 19de2e9d7b5c1a8c3dfa37b5c6f4e1f878312b06..efd3fd080dcbbcb7eea710ea1bd740ac89c03d2d 100644 (file)
--- a/src/tools/rados/rados.cc
+++ b/src/tools/rados/rados.cc
@@ -1548,8 +1548,6 @@ static void dump_inconsistent(const inconsistent_snapset_t& inc,
     f.dump_string("error", "info_corrupted");
   if (inc.snapset_mismatch())
     f.dump_string("error", "snapset_mismatch");
-  if (inc.head_mismatch())
-    f.dump_string("error", "head_mismatch");
   if (inc.headless())
     f.dump_string("error", "headless");
   if (inc.size_mismatch())