RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-06 08:20:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

osd/PG: chunky_scrub: degeneralize end boundary condition to head

Browse Source 
We can swap has_snapset() for is_head(), and drop the get_head()
on hobject_t's we know are head.

(The original constraint on the scrub boundary is still needed;
the clones get created to the left of both head and snapdir.)

Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2017-09-01 11:43:49 -04:00
parent 95c7077068
commit a16968927c
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/osd/PG.cc
View File

@ -4346,8 +4346,8 @@ void PG::chunky_scrub(ThreadPool::TPHandle &handle)
/* get the start and end of our scrub chunk
*
* Our scrub chunk has an important restriction we're going to need to
* respect. We can't let head or snapdir be start or end.
* Using a half-open interval means that if end == head|snapdir,
* respect. We can't let head be start or end.
* Using a half-open interval means that if end == head,
* we'd scrub/lock head and the clone right next to head in different
* chunks which would allow us to miss clones created between
* scrubbing that chunk and scrubbing the chunk including head.
@ -4373,8 +4373,8 @@ void PG::chunky_scrub(ThreadPool::TPHandle &handle)
if (!objects.empty()) {
hobject_t back = objects.back();
while (candidate_end.has_snapset() &&
candidate_end.get_head() == back.get_head()) {
while (candidate_end.is_head() &&
candidate_end == back.get_head()) {
candidate_end = back;
objects.pop_back();
if (objects.empty()) {
@ -4384,8 +4384,8 @@ void PG::chunky_scrub(ThreadPool::TPHandle &handle)
}
back = objects.back();
}
if (candidate_end.has_snapset()) {
assert(candidate_end.get_head() != back.get_head());
if (candidate_end.is_head()) {
assert(candidate_end != back.get_head());
candidate_end = candidate_end.get_object_boundary();
}
} else {

2
src/osd/PG.h
View File

@ -1239,7 +1239,7 @@ public:
int num_digest_updates_pending;
// chunky scrub
hobject_t start, end;
hobject_t start, end; // [start,end)
eversion_t subset_last_update;
// chunky scrub state