]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/ReplicatedPG: continue scrub logic when snapset.head_exists doesn't match
authorSage Weil <sage@inktank.com>
Tue, 1 Apr 2014 18:02:42 +0000 (11:02 -0700)
committerSage Weil <sage@inktank.com>
Tue, 1 Apr 2014 18:04:50 +0000 (11:04 -0700)
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>
src/osd/ReplicatedPG.cc

index 226ff43e81e6682492342ffd58b07ecbd8c916f4..8daeef90efda8ee09a8ffd33c1cd383820723624 100644 (file)
@@ -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();