]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/PG: fix scrub start object 7467/head
authorSage Weil <sage@redhat.com>
Mon, 1 Feb 2016 18:32:30 +0000 (13:32 -0500)
committerSage Weil <sage@redhat.com>
Mon, 1 Feb 2016 18:32:41 +0000 (13:32 -0500)
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>
src/osd/PG.cc

index afcd3e37e382e72161b84fcbc61755efde0e9540..2fd8dd2943ed432600b2c59232786219e7f5983d 100644 (file)
@@ -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;
 
        {