From: Sage Weil <sage@redhat.com>
Date: Mon, 1 Feb 2016 18:32:30 +0000 (-0500)
Subject: osd/PG: fix scrub start object
X-Git-Tag: v10.0.3~3^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F7467%2Fhead;p=ceph.git

osd/PG: fix scrub start object

This was changed in 05d79faa512210b0f0a91640d18db33b887a6e73 but it needs
to be more precise to avoid breaking BlueStore's assertions (that the
start position is within the collection range).

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

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index afcd3e37e382..2fd8dd2943ed 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -3994,9 +3994,8 @@ void PG::chunky_scrub(ThreadPool::TPHandle &handle)
 	  scrubber.reserved_peers.clear();
 	}
 
-        scrubber.start = hobject_t();
         // Don't include temporary objects when scrubbing
-        scrubber.start.pool = info.pgid.pool();
+        scrubber.start = info.pgid.pgid.get_hobj_start();
         scrubber.state = PG::Scrubber::NEW_CHUNK;
 
 	{