crimson/osd/pg: filter out snapmapper objects when doing pgls/pgnls

Signed-off-by: Xuehan Xu <xuxuehan@qianxin.com>

src/crimson/osd/ops_executer.cc

@@ -1173,7 +1173,8 @@ static PG::interruptible_future<ceph::bufferlist> do_pgnls_common(
   const hobject_t& lower_bound,
   const std::string& nspace,
   const uint64_t limit,
-  const PGLSFilter* const filter)
+  const PGLSFilter* const filter,
+  const PG &pg)
 {
   if (!(lower_bound.is_min() ||
         lower_bound.is_max() ||
@@ -1183,9 +1184,16 @@ static PG::interruptible_future<ceph::bufferlist> do_pgnls_common(
   }
 
   return backend.list_objects(lower_bound, limit).then_interruptible(
-    [&backend, filter, nspace](auto&& ret)
+    [&backend, filter, nspace, &pg](auto&& ret)
     -> PG::interruptible_future<std::tuple<std::vector<hobject_t>, hobject_t>> {
       auto& [objects, next] = ret;
+      auto is_snapmapper = [&pg](const hobject_t &obj) {
+	if (obj == pg.make_snapmapper_oid().hobj) {
+	  return false;
+	} else {
+	  return true;
+	}
+      };
       auto in_my_namespace = [&nspace](const hobject_t& obj) {
         using crimson::common::local_conf;
         if (obj.get_namespace() == local_conf()->osd_hit_set_namespace) {
@@ -1213,7 +1221,8 @@ static PG::interruptible_future<ceph::bufferlist> do_pgnls_common(
         }
       };
 
-      auto range = objects | boost::adaptors::filtered(in_my_namespace)
+      auto range = objects | boost::adaptors::filtered(is_snapmapper)
+			   | boost::adaptors::filtered(in_my_namespace)
                            | boost::adaptors::transformed(to_pglsed);
       logger().debug("do_pgnls_common: finishing the 1st stage of pgls");
       return seastar::when_all_succeed(std::begin(range),
@@ -1270,7 +1279,8 @@ static PG::interruptible_future<> do_pgnls(
                          lower_bound,
                          nspace,
                          osd_op.op.pgls.count,
-                         nullptr /* no filter */)
+                         nullptr /* no filter */,
+			 pg)
     .then_interruptible([&osd_op](bufferlist bl) {
       osd_op.outdata = std::move(bl);
       return seastar::now();
@@ -1314,7 +1324,8 @@ static PG::interruptible_future<> do_pgnls_filtered(
                              lower_bound,
                              nspace,
                              osd_op.op.pgls.count,
-                             filter.get())
+                             filter.get(),
+			     pg)
         .then_interruptible([&osd_op](bufferlist bl) {
           osd_op.outdata = std::move(bl);
           return seastar::now();
@@ -1329,7 +1340,8 @@ static PG::interruptible_future<ceph::bufferlist> do_pgls_common(
   const hobject_t& lower_bound,
   const std::string& nspace,
   const uint64_t limit,
-  const PGLSFilter* const filter)
+  const PGLSFilter* const filter,
+  const PG &pg)
 {
   if (!(lower_bound.is_min() ||
         lower_bound.is_max() ||
@@ -1340,12 +1352,15 @@ static PG::interruptible_future<ceph::bufferlist> do_pgls_common(
 
   using entries_t = decltype(pg_ls_response_t::entries);
   return backend.list_objects(lower_bound, limit).then_interruptible(
-    [&backend, filter, nspace](auto&& ret) {
+    [&backend, filter, nspace, &pg](auto&& ret) {
       auto& [objects, next] = ret;
       return PG::interruptor::when_all(
         PG::interruptor::map_reduce(std::move(objects),
-          [&backend, filter, nspace](const hobject_t& obj)
+          [&backend, filter, nspace, &pg](const hobject_t& obj)
 	  -> PG::interruptible_future<hobject_t>{
+	    if (obj == pg.make_snapmapper_oid().hobj) {
+	      return seastar::make_ready_future<hobject_t>();
+	    }
             if (obj.get_namespace() == nspace) {
               if (filter) {
                 return pgls_filter(*filter, backend, obj);
@@ -1399,7 +1414,8 @@ static PG::interruptible_future<> do_pgls(
 			lower_bound,
 			nspace,
 			osd_op.op.pgls.count,
-			nullptr /* no filter */)
+			nullptr /* no filter */,
+			pg)
     .then_interruptible([&osd_op](bufferlist bl) {
       osd_op.outdata = std::move(bl);
       return seastar::now();
@@ -1443,7 +1459,8 @@ static PG::interruptible_future<> do_pgls_filtered(
                             lower_bound,
                             nspace,
                             osd_op.op.pgls.count,
-                            filter.get())
+                            filter.get(),
+			    pg)
         .then_interruptible([&osd_op](bufferlist bl) {
           osd_op.outdata = std::move(bl);
           return seastar::now();

src/crimson/osd/pg.h

@@ -647,8 +647,12 @@ class PG : public boost::intrusive_ref_counter<
 private:
   OSDriver osdriver;
   SnapMapper snap_mapper;
-
-  ghobject_t make_snapmapper_oid() {
+public:
+  // PeeringListener
+  void publish_stats_to_osd() final;
+  void clear_publish_stats() final;
+  pg_stat_t get_stats() const;
+  ghobject_t make_snapmapper_oid() const {
     return ghobject_t(hobject_t(
       sobject_t(
        object_t("snapmapper"),
@@ -658,11 +662,7 @@ class PG : public boost::intrusive_ref_counter<
       pgid.pool(),
       std::string()));
   }
-public:
-  // PeeringListener
-  void publish_stats_to_osd() final;
-  void clear_publish_stats() final;
-  pg_stat_t get_stats() const;
+
 private:
   std::optional<pg_stat_t> pg_stats;