mon: remove need for friending OSDMap to PGMapUpdater

This used to be the friend relationship to PGMonitor.  It
was never really needed anyway, it was only being used
to skip the getter on `pools`

Signed-off-by: John Spray <john.spray@redhat.com>

diff --git a/src/mon/PGMap.cc b/src/mon/PGMap.cc
index 82fedf736d3b2665ff10741996ad5b14115684af..37099cb0008169e0cb666956add05ef45d07016c 100644 (file)
--- a/src/mon/PGMap.cc
+++ b/src/mon/PGMap.cc
@@ -2212,7 +2212,9 @@ void PGMapUpdater::register_new_pgs(
            << ", last_pg_scan " << pg_map->last_pg_scan << dendl;
 
   int created = 0;
-  for (const auto &p : osd_map.pools) {
+  const auto &pools = osd_map.get_pools();
+
+  for (const auto &p : pools) {
     int64_t poolid = p.first;
     const pg_pool_t &pool = p.second;
     int ruleno = osd_map.crush->find_rule(pool.get_crush_ruleset(),

diff --git a/src/osd/OSDMap.h b/src/osd/OSDMap.h
index ce5a0384f946adf353302ca5a994848eb511d11c..4f05dc256693bf0b64cd3f73d5d18c586c2a3c28 100644 (file)
--- a/src/osd/OSDMap.h
+++ b/src/osd/OSDMap.h
@@ -255,8 +255,6 @@ private:
   ceph::shared_ptr<CrushWrapper> crush;       // hierarchical map
 
   friend class OSDMonitor;
-  // FIXME: the elements required for PGMap updates should be exposed properly
-  friend class PGMapUpdater;
 
  public:
   OSDMap() : epoch(0),