RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-01 16:42:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

osd: Don't clear m_planned_scrub until scrub finishes successfully

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

Signed-off-by: David Zafman <dzafman@redhat.com>
This commit is contained in:
David Zafman 2021-02-17 12:08:13 -08:00
parent 6bfdef8d9e
commit 0b63c850a2
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/osd/pg_scrubber.cc
View File

@ -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