OSD: do deep_scrub for repair

Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: David Zafman <david.zafman@inktank.com>

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 6bad8a2f9ed7d7ab5580d41bb978146f02931438..2b4e7c1fdd706de460bc2051b09ef5fe6ec8d9bc 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -3495,7 +3495,7 @@ void OSD::handle_scrub(MOSDScrub *m)
       if (pg->is_primary()) {
        pg->unreg_next_scrub();
        pg->scrubber.must_scrub = true;
-       pg->scrubber.must_deep_scrub = m->deep;
+       pg->scrubber.must_deep_scrub = m->deep || m->repair;
        pg->scrubber.must_repair = m->repair;
        pg->reg_next_scrub();
        dout(10) << "marking " << *pg << " for scrub" << dendl;
@@ -3512,7 +3512,7 @@ void OSD::handle_scrub(MOSDScrub *m)
        if (pg->is_primary()) {
          pg->unreg_next_scrub();
          pg->scrubber.must_scrub = true;
-         pg->scrubber.must_deep_scrub = m->deep;
+         pg->scrubber.must_deep_scrub = m->deep || m->repair;
          pg->scrubber.must_repair = m->repair;
          pg->reg_next_scrub();
          dout(10) << "marking " << *pg << " for scrub" << dendl;