From: David Zafman <dzafman@redhat.com>
Date: Wed, 17 Feb 2021 20:08:13 +0000 (-0800)
Subject: osd: Don't clear m_planned_scrub until scrub finishes successfully
X-Git-Tag: v17.1.0~2898^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0b63c850a251f75bcb7436efefe4f24480c4ed7e;p=ceph.git

osd: Don't clear m_planned_scrub until scrub finishes successfully

Fixes: https://tracker.ceph.com/issues/48984

Signed-off-by: David Zafman <dzafman@redhat.com>
---

diff --git a/src/osd/pg_scrubber.cc b/src/osd/pg_scrubber.cc
index 526eff86c65..ecf2a3affc5 100644
--- a/src/osd/pg_scrubber.cc
+++ b/src/osd/pg_scrubber.cc
@@ -1141,7 +1141,6 @@ void PgScrubber::set_op_parameters(requested_scrub_t& request)
   // the publishing here seems to be required for tests synchronization
   m_pg->publish_stats_to_osd();
   m_flags.deep_scrub_on_error = request.deep_scrub_on_error;
-  request = requested_scrub_t{};
 }
 
 void PgScrubber::scrub_compare_maps()
@@ -1490,6 +1489,8 @@ void PgScrubber::scrub_finish()
 
   ceph_assert(m_pg->is_locked());
 
+  m_pg->m_planned_scrub = requested_scrub_t{};
+
   // if the repair request comes from auto-repair and large number of errors,
   // we would like to cancel auto-repair