RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-20 09:27:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

mon: remove need for friending OSDMap to PGMapUpdater

Browse Source 
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>
This commit is contained in:
John Spray 2016-09-22 18:01:21 +01:00
parent afa7078763
commit 78b6eebf71
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mon/PGMap.cc
View File

@ -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(),

2
src/osd/OSDMap.h
View File

@ -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),