From: Ronen Friedman <rfriedma@redhat.com>
Date: Wed, 28 Sep 2022 13:52:52 +0000 (+0000)
Subject: quincy: osd/scrub: use the actual active set when requesting replicas
X-Git-Tag: v17.2.6~306^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3a3d0bcb251e2d27870ae090743ab6c09a87ad0a;p=ceph.git

quincy: osd/scrub: use the actual active set when requesting replicas

... to scrub

Note that get_acting_set() may differ from
get_acting_recovery_backfill() - if we are remapped

Fixes: https://tracker.ceph.com/issues/57698
Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
(cherry picked from commit 967a4a4ab7a2503ce753cd5c71865d6dcc4597be)

Conflicts:
  src/osd/pg_scrubber.cc

Conflicting due to post-Quincy changes related to the ScrubBackend.
No unrelated changes were selected.
---

diff --git a/src/osd/scrubber/pg_scrubber.cc b/src/osd/scrubber/pg_scrubber.cc
index 220d2933cd00..839b57d8d490 100644
--- a/src/osd/scrubber/pg_scrubber.cc
+++ b/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;