From: John Spray <john.spray@redhat.com>
Date: Thu, 22 Sep 2016 17:01:21 +0000 (+0100)
Subject: mon: remove need for friending OSDMap to PGMapUpdater
X-Git-Tag: v11.0.1~60^2~13
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=78b6eebf71761bc5b17574b850ef59f28e2a3371;p=ceph.git

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 82fedf736d3b2..37099cb000816 100644
--- 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 ce5a0384f946a..4f05dc256693b 100644
--- 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),