From: Ronen Friedman <rfriedma@redhat.com>
Date: Sat, 28 Oct 2023 16:42:34 +0000 (-0500)
Subject: osd/scrub: do not clear PG_STATE_REPAIR unconditionally
X-Git-Tag: v19.0.0~197^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e75643f717a00454678ff0882f38da9d24281168;p=ceph.git

osd/scrub: do not clear PG_STATE_REPAIR unconditionally

As we now call clear_pgscrub_state() at the end of each
'Session' state, we must not clear PG_STATE_REPAIR
unconditionally.

Previously - scrubs that reached normal completion, i.e.
reached PgScrubber::scrub_finish(), would have only cleared
that PG flag under specific conditions. That was changed in
previous commits of this PR, and is now fixed.

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 b090ec113ee3..5afc2ced2725 100644
--- a/src/osd/scrubber/pg_scrubber.cc
+++ b/src/osd/scrubber/pg_scrubber.cc
@@ -2166,8 +2166,6 @@ void PgScrubber::clear_pgscrub_state()
   state_clear(PG_STATE_SCRUBBING);
   state_clear(PG_STATE_DEEP_SCRUB);
 
-  state_clear(PG_STATE_REPAIR);
-
   m_local_osd_resource.reset();
   requeue_waiting();