]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
osd: fix ScrubMap::swap() to include all ScrubMap data members
authorRonen Friedman <rfriedma@redhat.com>
Tue, 16 Aug 2022 14:25:48 +0000 (17:25 +0300)
committerRonen Friedman <rfriedma@redhat.com>
Fri, 19 Aug 2022 16:21:20 +0000 (19:21 +0300)
Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
src/osd/osd_types.h

index acf5875a32e94dfb224b849a9a67a0e08e24f572..a10c787257c07f5b229f43f925880fbc531e4d1b 100644 (file)
@@ -6070,6 +6070,8 @@ std::ostream& operator<<(std::ostream& out, const PushOp &op);
 
 /*
  * summarize pg contents for purposes of a scrub
+ *
+ * If members are added to ScrubMap, make sure to modify swap().
  */
 struct ScrubMap {
   struct object {
@@ -6122,6 +6124,8 @@ struct ScrubMap {
     swap(objects, r.objects);
     swap(valid_through, r.valid_through);
     swap(incr_since, r.incr_since);
+    swap(has_large_omap_object_errors, r.has_large_omap_object_errors);
+    swap(has_omap_keys, r.has_omap_keys);
   }
 
   void encode(ceph::buffer::list& bl) const;