From: Sage Weil <sage@redhat.com>
Date: Thu, 4 Jul 2019 23:24:41 +0000 (-0500)
Subject: osd/osd_types: remove 'snap_context' from SnapSet::dump()
X-Git-Tag: v15.1.0~2272^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=70ad54a0b342f77be04d1ce39d71bd5a5b47fd0b;p=ceph-ci.git

osd/osd_types: remove 'snap_context' from SnapSet::dump()

We no longer have a snaps field with real values, so dumping this as a
"snap_context" is silly.  Instead, just dump the seq.

Adjust qa/standalone/scrub/osd-scrub-repair.sh accordingly.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/qa/standalone/scrub/osd-scrub-repair.sh b/qa/standalone/scrub/osd-scrub-repair.sh
index 0582fa1417b..351ae4ba798 100755
--- a/qa/standalone/scrub/osd-scrub-repair.sh
+++ b/qa/standalone/scrub/osd-scrub-repair.sh
@@ -5847,12 +5847,7 @@ function TEST_corrupt_snapset_scrub_rep() {
                 ]
               }
             ],
-            "snap_context": {
-              "seq": 1,
-              "snaps": [
-                1
-              ]
-            }
+            "seq": 1
           }
         },
         {
@@ -5862,10 +5857,7 @@ function TEST_corrupt_snapset_scrub_rep() {
           "size": 21,
           "snapset": {
             "clones": [],
-            "snap_context": {
-              "seq": 0,
-              "snaps": []
-            }
+            "seq": 0
           }
         }
       ]
@@ -5925,10 +5917,7 @@ function TEST_corrupt_snapset_scrub_rep() {
           "size": 21,
           "snapset": {
             "clones": [],
-            "snap_context": {
-              "seq": 0,
-              "snaps": []
-            }
+            "seq": 0
           }
         },
         {
@@ -5947,12 +5936,7 @@ function TEST_corrupt_snapset_scrub_rep() {
                 ]
               }
             ],
-            "snap_context": {
-              "seq": 1,
-              "snaps": [
-                1
-              ]
-            }
+            "seq": 1
           }
         }
       ]
diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc
index 6e7135eae4a..893c66544cc 100644
--- a/src/osd/osd_types.cc
+++ b/src/osd/osd_types.cc
@@ -5326,10 +5326,7 @@ void SnapSet::decode(ceph::buffer::list::const_iterator& bl)
 
 void SnapSet::dump(Formatter *f) const
 {
-  SnapContext sc(seq, snaps);
-  f->open_object_section("snap_context");
-  sc.dump(f);
-  f->close_section();
+  f->dump_unsigned("seq", seq);
   f->open_array_section("clones");
   for (auto p = clones.cbegin(); p != clones.cend(); ++p) {
     f->open_object_section("clone");