diff options
| author | Sage Weil <sage@redhat.com> | 2016-02-01 19:32:30 +0100 |
|---|---|---|
| committer | Sage Weil <sage@redhat.com> | 2016-02-01 19:32:41 +0100 |
| commit | 62906d88f94ca134ef36a0f8ae8750a1f783d8fa (patch) | |
| tree | ae21aecad5487e85bc7d345b87e40ce9c453b7fb | |
| parent | Merge pull request #7248 from ukernel/jewel-14379 (diff) | |
| download | ceph-62906d88f94ca134ef36a0f8ae8750a1f783d8fa.tar.xz ceph-62906d88f94ca134ef36a0f8ae8750a1f783d8fa.zip | |
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>
| -rw-r--r-- | src/osd/PG.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/osd/PG.cc b/src/osd/PG.cc index afcd3e37e38..2fd8dd2943e 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; { |