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

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 backfilling or recovering.

Fixes: https://tracker.ceph.com/issues/57698
Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
---

diff --git a/src/osd/scrubber/pg_scrubber.cc b/src/osd/scrubber/pg_scrubber.cc
index 7597f4a7d27..77f1e16c9fd 100644
--- a/src/osd/scrubber/pg_scrubber.cc
+++ b/src/osd/scrubber/pg_scrubber.cc
@@ -891,7 +891,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;
@@ -1005,7 +1005,7 @@ void PgScrubber::on_init()
     m_pg_whoami,
     m_is_repair,
     m_is_deep ? scrub_level_t::deep : scrub_level_t::shallow,
-    m_pg->get_acting_recovery_backfill());
+    m_pg->get_actingset());
 
   //  create a new store
   {