From: Samuel Just <sam.just@inktank.com>
Date: Sat, 22 Dec 2012 01:21:59 +0000 (-0800)
Subject: OSD: always do a deep scrub when repairing
X-Git-Tag: v0.56~18^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f6b2ca8b38c5e24a725454dba1afc607d4bdfddf;p=ceph.git

OSD: always do a deep scrub when repairing

Otherwise, errors turned up in a deep-scrub will be
swept under the rug without being repaired.

Signed-off-by: Samuel Just <sam.just@inktank.com>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index ff9992a1c32a..5dd2f6391be3 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -3514,7 +3514,7 @@ void OSD::handle_scrub(MOSDScrub *m)
 	if (pg->is_primary()) {
 	  if (m->repair)
 	    pg->state_set(PG_STATE_REPAIR);
-	  if (m->deep)
+	  if (m->deep || m->repair)
 	    pg->state_set(PG_STATE_DEEP_SCRUB);
 	  if (pg->queue_scrub()) {
 	    dout(10) << "queueing " << *pg << " for scrub" << dendl;