osd/scrub: move snap_mapper_{fix/op}_t to the Scrub namespace

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>

diff --git a/src/osd/SnapMapReaderI.h b/src/osd/SnapMapReaderI.h
index f979dff5db235b7213cc1bcafddf5f77f5ea204c..664e9bd4219b944bfd00fec61a0192979047af83 100644 (file)
--- a/src/osd/SnapMapReaderI.h
+++ b/src/osd/SnapMapReaderI.h
@@ -51,8 +51,6 @@ struct SnapMapReaderI {
   virtual ~SnapMapReaderI() = default;
 };
 
-}  // namespace Scrub
-
 enum class snap_mapper_op_t {
   add,
   update,
@@ -66,3 +64,5 @@ struct snap_mapper_fix_t {
   std::set<snapid_t> snaps;
   std::set<snapid_t> wrong_snaps;  // only collected & returned for logging sake
 };
+
+}  // namespace Scrub

diff --git a/src/osd/scrubber/pg_scrubber.h b/src/osd/scrubber/pg_scrubber.h
index 8d3359c874648846f8d2e72ec6f7e08625f4cbfc..66292c0edffd1a99558499be8df99476eb308651 100644 (file)
--- a/src/osd/scrubber/pg_scrubber.h
+++ b/src/osd/scrubber/pg_scrubber.h
@@ -881,7 +881,8 @@ class PgScrubber : public ScrubPgIF,
   Scrub::MapsCollectionStatus m_maps_status;
 
   void persist_scrub_results(inconsistent_objs_t&& all_errors);
-  void apply_snap_mapper_fixes(const std::vector<snap_mapper_fix_t>& fix_list);
+  void apply_snap_mapper_fixes(
+    const std::vector<Scrub::snap_mapper_fix_t>& fix_list);
 
   // our latest periodic 'publish_stats_to_osd()'. Required frequency depends on
   // scrub state.

diff --git a/src/osd/scrubber/scrub_backend.h b/src/osd/scrubber/scrub_backend.h
index e8c7c2bcabb7a72e1994872aae91a99a486630d3..d2ff62f96fd958d992a0780fc1489eeb3c71bf1a 100644 (file)
--- a/src/osd/scrubber/scrub_backend.h
+++ b/src/osd/scrubber/scrub_backend.h
@@ -103,7 +103,7 @@ struct ScrubBeListener {
 // objects:
 struct objs_fix_list_t {
   inconsistent_objs_t inconsistent_objs;
-  std::vector<snap_mapper_fix_t> snap_fix_list;
+  std::vector<Scrub::snap_mapper_fix_t> snap_fix_list;
 };
 
 /**
@@ -321,7 +321,7 @@ class ScrubBackend {
    */
   void update_repair_status(bool should_repair);
 
-  std::vector<snap_mapper_fix_t> replica_clean_meta(
+  std::vector<Scrub::snap_mapper_fix_t> replica_clean_meta(
     ScrubMap& smap,
     bool max_reached,
     const hobject_t& start,
@@ -500,7 +500,7 @@ class ScrubBackend {
   /**
    * returns a list of snaps "fix orders"
    */
-  std::vector<snap_mapper_fix_t> scan_snaps(
+  std::vector<Scrub::snap_mapper_fix_t> scan_snaps(
     ScrubMap& smap,
     Scrub::SnapMapReaderI& snaps_getter);
 
@@ -508,7 +508,7 @@ class ScrubBackend {
    * an aux used by scan_snaps(), possibly returning a fix-order
    * for a specific hobject.
    */
-  std::optional<snap_mapper_fix_t> scan_object_snaps(
+  std::optional<Scrub::snap_mapper_fix_t> scan_object_snaps(
     const hobject_t& hoid,
     const SnapSet& snapset,
     Scrub::SnapMapReaderI& snaps_getter);

diff --git a/src/test/osd/test_scrubber_be.cc b/src/test/osd/test_scrubber_be.cc
index fb8518de6a8beae9d77be75d9fa832864a7de060..65fd7e730ba9bde6a91d4e84feb8fa0bb81d7181 100644 (file)
--- a/src/test/osd/test_scrubber_be.cc
+++ b/src/test/osd/test_scrubber_be.cc
@@ -595,6 +595,7 @@ TEST_F(TestTScrubberBe_data_1, smaps_creation_1)
 /// corrupt the snap_mapper data
 TEST_F(TestTScrubberBe_data_1, snapmapper_1)
 {
+  using snap_mapper_op_t = Scrub::snap_mapper_op_t;
   ASSERT_TRUE(sbe);
 
   // a bogus version of hobj_ms1_snp30 (a clone) snap_ids