Merge pull request ceph#57125 from xxhdx1985126/wip-65679

crimson/osd/pg: reset the snap mapper's backend when pg interval changes

Reviewed-by: Samuel Just <[email protected]>
Reviewed-by: Radosław Zarzyński <[email protected]>
Reviewed-by: Matan Breizman <[email protected]>

Author: Matan-B

src/common/map_cacher.hpp

@@ -85,6 +85,10 @@ class MapCacher {
 public:
   MapCacher(StoreDriver<K, V> *driver) : driver(driver) {}
 
+  void reset() {
+    in_progress.reset();
+  }
+
   /// Fetch first key/value std::pair after specified key
   int get_next(
     K key,               ///< [in] key after which to get next

src/common/sharedptr_registry.hpp

@@ -18,6 +18,7 @@
 #include <map>
 #include <memory>
 #include "common/ceph_mutex.h"
+#include "include/ceph_assert.h"
 
 /**
  * Provides a registry of shared_ptr<V> indexed by K while
@@ -61,6 +62,11 @@ class SharedPtrRegistry {
     waiting(0)
   {}
 
+  void reset() {
+    ceph_assert(!waiting);
+    contents.clear();
+  }
+
   bool empty() {
     std::lock_guard l(lock);
     return contents.empty();

src/crimson/osd/pg.cc

@@ -1626,6 +1626,7 @@ void PG::on_change(ceph::os::Transaction &t) {
   // is save and in time.
   peering_state.state_clear(PG_STATE_SNAPTRIM);
   peering_state.state_clear(PG_STATE_SNAPTRIM_ERROR);
+  snap_mapper.reset_backend();
 }
 
 void PG::context_registry_on_change() {

src/osd/SnapMapper.h

@@ -356,6 +356,11 @@ class SnapMapper : public Scrub::SnapMapReaderI {
     return prefix_itr;
   }
 
+  /// reset the MapCacher backend, this should be called on pg interval change
+  void reset_backend() {
+    backend.reset();
+  }
+
   /// Update snaps for oid, empty new_snaps removes the mapping
   int update_snaps(
     const hobject_t &oid,       ///< [in] oid to update