From: Sage Weil <sage@redhat.com>
Date: Fri, 24 Jul 2015 14:08:18 +0000 (-0400)
Subject: osd/PG: use hash instead of filestore key for scrub
X-Git-Tag: v9.1.0~346^2~26
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1f9e8b85ef7bf13205929dea9b000c1f72d83e51;p=ceph.git

osd/PG: use hash instead of filestore key for scrub

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>
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index be9a5489d2bb..68d74b130382 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -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;
               }