From: Samuel Just <sjust@redhat.com>
Date: Wed, 8 Feb 2023 06:57:03 +0000 (+0000)
Subject: osd/scrubber: move m_remote_osd_resource.reset() into advance_token()
X-Git-Tag: v19.0.0~1389^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=97e4891fa10938976706e2c7ee8c292b34d12623;p=ceph.git

osd/scrubber: move m_remote_osd_resource.reset() into advance_token()

Signed-off-by: Samuel Just <sjust@redhat.com>
---

diff --git a/src/osd/scrubber/pg_scrubber.cc b/src/osd/scrubber/pg_scrubber.cc
index c9896946da81..42a89789b3ce 100644
--- a/src/osd/scrubber/pg_scrubber.cc
+++ b/src/osd/scrubber/pg_scrubber.cc
@@ -1600,7 +1600,6 @@ void PgScrubber::handle_scrub_reserve_request(OpRequestRef op)
   /* The primary may unilaterally restart the scrub process without notifying
    * replicas.  Unconditionally clear any existing state prior to handling
    * the new reservation. */
-  m_remote_osd_resource.reset();
   advance_token();
   
   bool granted{false};
@@ -1663,7 +1662,6 @@ void PgScrubber::handle_scrub_reserve_release(OpRequestRef op)
    *  the old tag will be discarded.
    */
   advance_token();
-  m_remote_osd_resource.reset();
 }
 
 void PgScrubber::discard_replica_reservations()
@@ -2352,6 +2350,7 @@ void PgScrubber::advance_token()
   // place. We will, though, verify that. And if we are actually still handling
   // a stale request - both our internal state and the FSM state will be
   // cleared.
+  m_remote_osd_resource.reset();
   replica_handling_done();
   m_fsm->process_event(FullReset{});
 }