]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/scrub: do not clear PG_STATE_REPAIR unconditionally 53843/head
authorRonen Friedman <rfriedma@redhat.com>
Sat, 28 Oct 2023 16:42:34 +0000 (11:42 -0500)
committerRonen Friedman <rfriedma@redhat.com>
Sat, 28 Oct 2023 16:42:34 +0000 (11:42 -0500)
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>
src/osd/scrubber/pg_scrubber.cc

index b090ec113ee3de81bd36af7d6fe9b46f19b387c4..5afc2ced27258c9e89e52ef6e8c8ee3f86d08e71 100644 (file)
@@ -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();