From: David Zafman <dzafman@redhat.com>
Date: Wed, 4 Apr 2018 22:58:57 +0000 (-0700)
Subject: osd rados command: Change error name snapset_mismatch to snapset_error
X-Git-Tag: v12.2.5~11^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2d2ee965f3181b3811a4a3b407f8f943ed6b40be;p=ceph.git

osd rados command: Change error name snapset_mismatch to snapset_error

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 007cb45fe5c8fd1ffb8db2422a11d67d74bbf5b5)

Conflicts:
	doc/rados/command/list-inconsistent-snap.json (trivial)
	src/common/scrub_types.h (trivial)
	src/include/rados/rados_types.hpp (trivial)
	src/tools/rados/rados.cc (trivial)
---

diff --git a/doc/rados/command/list-inconsistent-snap.json b/doc/rados/command/list-inconsistent-snap.json
index 76bb478cfafb..22044719f0bb 100644
--- a/doc/rados/command/list-inconsistent-snap.json
+++ b/doc/rados/command/list-inconsistent-snap.json
@@ -44,7 +44,7 @@
                 "snapset_corrupted",
                 "info_missing",
                 "info_corrupted",
-                "snapset_mismatch",
+                "snapset_error",
                 "head_mismatch",
                 "headless",
                 "size_mismatch",
diff --git a/qa/standalone/scrub/osd-scrub-snaps.sh b/qa/standalone/scrub/osd-scrub-snaps.sh
index 47e86e96b486..de3dc71e98e9 100755
--- a/qa/standalone/scrub/osd-scrub-snaps.sh
+++ b/qa/standalone/scrub/osd-scrub-snaps.sh
@@ -393,7 +393,7 @@ function TEST_scrub_snaps() {
     },
     {
       "errors": [
-        "snapset_mismatch"
+        "snapset_error"
       ],
       "snap": "head",
       "locator": "",
diff --git a/src/common/scrub_types.cc b/src/common/scrub_types.cc
index cb961b1d7293..149078518b3f 100644
--- a/src/common/scrub_types.cc
+++ b/src/common/scrub_types.cc
@@ -216,9 +216,9 @@ void inconsistent_snapset_wrapper::set_clone(snapid_t snap)
   clones.push_back(snap);
 }
 
-void inconsistent_snapset_wrapper::set_snapset_mismatch()
+void inconsistent_snapset_wrapper::set_snapset_error()
 {
-  errors |= inc_snapset_t::SNAP_MISMATCH;
+  errors |= inc_snapset_t::SNAP_ERROR;
 }
 
 void inconsistent_snapset_wrapper::set_head_mismatch()
diff --git a/src/common/scrub_types.h b/src/common/scrub_types.h
index 5f16ad79e7f3..1309a606084d 100644
--- a/src/common/scrub_types.h
+++ b/src/common/scrub_types.h
@@ -160,7 +160,7 @@ struct inconsistent_snapset_wrapper : public librados::inconsistent_snapset_t {
   // Clones that are there
   void set_clone(snapid_t);
   // the snapset is not consistent with itself
-  void set_snapset_mismatch();
+  void set_snapset_error();
   // soid.snap inconsistent with snapset
   void set_head_mismatch();
   void set_size_mismatch();
diff --git a/src/include/rados/rados_types.hpp b/src/include/rados/rados_types.hpp
index 652fbe1b1868..7cd1cd33f942 100644
--- a/src/include/rados/rados_types.hpp
+++ b/src/include/rados/rados_types.hpp
@@ -250,7 +250,7 @@ struct inconsistent_snapset_t {
     SNAPSET_MISSING = 1 << 0,
     SNAPSET_CORRUPTED = 1 << 1,
     CLONE_MISSING  = 1 << 2,
-    SNAP_MISMATCH  = 1 << 3,
+    SNAP_ERROR  = 1 << 3,
     HEAD_MISMATCH  = 1 << 4,
     HEADLESS_CLONE = 1 << 5,
     SIZE_MISMATCH  = 1 << 6,
@@ -281,8 +281,11 @@ struct inconsistent_snapset_t {
   bool clone_missing() const  {
     return errors & CLONE_MISSING;
   }
-  bool snapset_mismatch() const {
-    return errors & SNAP_MISMATCH;
+  bool snapset_mismatch() const {    // Compatibility
+    return errors & SNAP_ERROR;
+  }
+  bool snapset_error() const {
+    return errors & SNAP_ERROR;
   }
   bool head_mismatch() const {
     return errors & HEAD_MISMATCH;
diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
index 771bd8083646..dc393c463100 100644
--- a/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@ -14004,7 +14004,7 @@ void PrimaryLogPG::scrub_snapshot_metadata(
 	    osd->clog->error() << mode << " " << info.pgid << " " << soid
 			       << " snaps.seq not set";
 	    ++scrubber.shallow_errors;
-	    head_error.set_snapset_mismatch();
+	    head_error.set_snapset_error();
           }
 	}
 
diff --git a/src/tools/rados/rados.cc b/src/tools/rados/rados.cc
index 0e9d0e89d288..4a0a3d73a02a 100644
--- a/src/tools/rados/rados.cc
+++ b/src/tools/rados/rados.cc
@@ -1542,8 +1542,8 @@ static void dump_inconsistent(const inconsistent_snapset_t& inc,
     f.dump_string("error", "info_missing");
   if (inc.info_corrupted())
     f.dump_string("error", "info_corrupted");
-  if (inc.snapset_mismatch())
-    f.dump_string("error", "snapset_mismatch");
+  if (inc.snapset_error())
+    f.dump_string("error", "snapset_error");
   if (inc.head_mismatch())
     f.dump_string("error", "head_mismatch");
   if (inc.headless())