From: Samuel Just <sam.just@inktank.com>
Date: Fri, 18 Jan 2013 22:35:51 +0000 (-0800)
Subject: OSD: do deep_scrub for repair
X-Git-Tag: v0.57~159
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0cb760f31b0cb26f022fe8b9341e41cd5351afac;p=ceph.git

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 6bad8a2f9ed7..2b4e7c1fdd70 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;