From: Sage Weil <sage@inktank.com>
Date: Tue, 1 Apr 2014 18:02:42 +0000 (-0700)
Subject: osd/ReplicatedPG: continue scrub logic when snapset.head_exists doesn't match
X-Git-Tag: v0.79~21^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dde1c916052c11a10b7c7aa8e07f29220952feb1;p=ceph.git

osd/ReplicatedPG: continue scrub logic when snapset.head_exists doesn't match

The 'continue' will cause more damange/noise than continuing because the
next_clone value won't be updated properly.

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 226ff43e81e6..8daeef90efda 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -11181,13 +11181,11 @@ void ReplicatedPG::_scrub(ScrubMap& scrubmap)
 	osd->clog.error() << mode << " " << info.pgid << " " << soid
 			  << " snapset.head_exists=false, but head exists";
         ++scrubber.shallow_errors;
-	continue;
       }
       if (soid.snap == CEPH_SNAPDIR && snapset.head_exists) {
 	osd->clog.error() << mode << " " << info.pgid << " " << soid
 			  << " snapset.head_exists=true, but snapdir exists";
         ++scrubber.shallow_errors;
-	continue;
       }
       if (curclone == snapset.clones.rend()) {
 	next_clone = hobject_t();