import ceph quincy 17.2.6

[ceph.git] / ceph / src / osd / scrubber / pg_scrubber.cc

diff --git a/ceph/src/osd/scrubber/pg_scrubber.cc b/ceph/src/osd/scrubber/pg_scrubber.cc
index 220d2933cd00b601d8bb8633cabc27a63cd0ea17..839b57d8d490a50894f8f8563727fc298e03fc63 100644 (file)
--- a/ceph/src/osd/scrubber/pg_scrubber.cc
+++ b/ceph/src/osd/scrubber/pg_scrubber.cc
@@ -860,7 +860,7 @@ void PgScrubber::get_replicas_maps(bool replica_can_preempt)
   m_primary_scrubmap_pos.reset();
 
   // ask replicas to scan and send maps
-  for (const auto& i : m_pg->get_acting_recovery_backfill()) {
+  for (const auto& i : m_pg->get_actingset()) {
 
     if (i == m_pg_whoami)
       continue;
@@ -1377,7 +1377,7 @@ void PgScrubber::scrub_compare_maps()
   map<pg_shard_t, ScrubMap*> maps;
   maps[m_pg_whoami] = &m_primary_scrubmap;
 
-  for (const auto& i : m_pg->get_acting_recovery_backfill()) {
+  for (const auto& i : m_pg->get_actingset()) {
     if (i == m_pg_whoami)
       continue;
     dout(2) << __func__ << " replica " << i << " has "
@@ -1401,7 +1401,7 @@ void PgScrubber::scrub_compare_maps()
     m_osds->clog->warn(ss);
   }
 
-  if (m_pg->recovery_state.get_acting_recovery_backfill().size() > 1) {
+  if (m_pg->recovery_state.get_actingset().size() > 1) {
 
     dout(10) << __func__ << "  comparing replica scrub maps" << dendl;