Merge remote-tracking branch 'gh/next'

diff --cc src/osd/OSD.cc
index 2b4e7c1fdd706de460bc2051b09ef5fe6ec8d9bc,a805d659758abce3067389a4f01b4a2c20bfdb5d..4549eb766710708ef2b42ecf19b1191d204c3252
--- 1/src/osd/OSD.cc
--- 2/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@@ -1526,11 -1529,11 +1526,11 @@@ void OSD::load_pgs(
        service.start_split(split_pgs);
      }
  
 -    service.reg_last_pg_scrub(pg->info.pgid, pg->info.history.last_scrub_stamp);
 +    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);