summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Just <sam.just@inktank.com>2013-01-18 14:35:51 -0800
committerSamuel Just <sam.just@inktank.com>2013-01-18 16:01:52 -0800
commit0cb760f31b0cb26f022fe8b9341e41cd5351afac (patch)
tree91590220ff65d73417e80e9096307362a2cc4e50
parent684a8f8f84312d4d9c6cdeb8d6d9fad792bd5a6d (diff)
downloadceph-0cb760f31b0cb26f022fe8b9341e41cd5351afac.tar.gz
OSD: do deep_scrub for repair
Signed-off-by: Samuel Just <sam.just@inktank.com> Reviewed-by: David Zafman <david.zafman@inktank.com>
-rw-r--r--src/osd/OSD.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 6bad8a2f9ed..2b4e7c1fdd7 100644
--- 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;