]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/PG: use hash instead of filestore key for scrub
authorSage Weil <sage@redhat.com>
Fri, 24 Jul 2015 14:08:18 +0000 (10:08 -0400)
committerSage Weil <sage@redhat.com>
Fri, 7 Aug 2015 14:16:05 +0000 (10:16 -0400)
It's doesn't matter, since it's a deterministic permutation of hte value
and we're checking for equality, but avoid the filestore-specific
nibblewise key to avoid confusion.

Signed-off-by: Sage Weil <sage@redhat.com>
src/osd/PG.cc

index be9a5489d2bba2956f51c2ad2ce91f7c5e5e03f1..68d74b130382a17fb1855e6d765a3fd0b7c10f95 100644 (file)
@@ -3928,7 +3928,7 @@ void PG::chunky_scrub(ThreadPool::TPHandle &handle)
               hobject_t end = objects.back().get_boundary();
               objects.pop_back();
 
-              if (objects.back().get_filestore_key() != end.get_filestore_key()) {
+              if (objects.back().get_hash() != end.get_hash()) {
                 candidate_end = end;
                 boundary_found = true;
               }