diff options
| author | Sage Weil <sage@inktank.com> | 2013-01-21 08:22:36 -0800 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-01-21 08:22:36 -0800 |
| commit | 3399860de2724281ee024b52f461b60f769ee0ee (patch) | |
| tree | 7fbcb54344d3a6b3d2e9d163994417a123c8a60f | |
| parent | 2e39dd5e6f7a7e55abb2d750e3a8a37b2e91e27f (diff) | |
| parent | 17160843d0c523359d8fa934418ff2c1f7bffb25 (diff) | |
| download | ceph-3399860de2724281ee024b52f461b60f769ee0ee.tar.gz | |
Merge remote-tracking branch 'gh/next'
| -rw-r--r-- | src/osd/OSD.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 2b4e7c1fdd7..4549eb76671 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -1528,9 +1528,9 @@ void OSD::load_pgs() pg->reg_next_scrub(); - // generate state for current mapping - osdmap->pg_to_up_acting_osds(pgid, pg->up, pg->acting); - int role = osdmap->calc_pg_role(whoami, pg->acting); + // generate state for PG's current mapping + pg->get_osdmap()->pg_to_up_acting_osds(pgid, pg->up, pg->acting); + int role = pg->get_osdmap()->calc_pg_role(whoami, pg->acting); pg->set_role(role); PG::RecoveryCtx rctx(0, 0, 0, 0, 0, 0); |